ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-09-28 17:22:02 +02:00
commit 52fc19444a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_detail/note.js
View File

@ -39,7 +39,7 @@ let Note = React.createClass({
}, },
render() { render() {
if (!!this.props.currentUser.username && this.props.show) { if ((!!this.props.currentUser.username && this.props.editable || !this.props.editable ) && this.props.show) {
return ( return (
<Form <Form
url={this.props.url} url={this.props.url}

2
js/components/whitelabel/prize/components/prize_piece_list.js
View File

@ -69,7 +69,7 @@ let PrizePieceList = React.createClass({
accordionListItemType={AccordionListItemPrize} accordionListItemType={AccordionListItemPrize}
orderParams={orderParams} orderParams={orderParams}
orderBy={this.state.currentUser.is_jury ? 'rating' : null} orderBy={this.state.currentUser.is_jury ? 'rating' : null}
filterParams={null} filterParams={[]}
customSubmitButton={this.getButtonSubmit()}/> customSubmitButton={this.getButtonSubmit()}/>
</div> </div>
); );

2
js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
View File

@ -6,6 +6,7 @@ import Router from 'react-router';
import ButtonLink from 'react-router-bootstrap/lib/ButtonLink'; import ButtonLink from 'react-router-bootstrap/lib/ButtonLink';
import UserStore from '../../../../../stores/user_store'; import UserStore from '../../../../../stores/user_store';
import UserActions from '../../../../../actions/user_actions';
import { getLangText } from '../../../../../utils/lang_utils'; import { getLangText } from '../../../../../utils/lang_utils';
@ -20,6 +21,7 @@ let IkonotvLanding = React.createClass({
componentDidMount() { componentDidMount() {
UserStore.listen(this.onChange); UserStore.listen(this.onChange);
UserActions.fetchCurrentUser();
}, },
componentWillUnmount() { componentWillUnmount() {