From db1ef91965000aebbf0d823d717e7edde226701b Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 28 Sep 2015 16:29:50 +0200 Subject: [PATCH 1/4] bug fix filterParams=null on sluice --- js/components/whitelabel/prize/components/prize_piece_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/whitelabel/prize/components/prize_piece_list.js b/js/components/whitelabel/prize/components/prize_piece_list.js index b10d8bb5..04f8eb42 100644 --- a/js/components/whitelabel/prize/components/prize_piece_list.js +++ b/js/components/whitelabel/prize/components/prize_piece_list.js @@ -69,7 +69,7 @@ let PrizePieceList = React.createClass({ accordionListItemType={AccordionListItemPrize} orderParams={orderParams} orderBy={this.state.currentUser.is_jury ? 'rating' : null} - filterParams={null} + filterParams={[]} customSubmitButton={this.getButtonSubmit()}/> ); From 19f94110b70060beee2d75ba740b7a516376a132 Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 28 Sep 2015 16:57:35 +0200 Subject: [PATCH 2/4] fix: ikonotv redirect to collection if logged in --- .../whitelabel/wallet/components/ikonotv/ikonotv_landing.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js index e991233a..0f5d129a 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js @@ -6,6 +6,7 @@ import Router from 'react-router'; import ButtonLink from 'react-router-bootstrap/lib/ButtonLink'; import UserStore from '../../../../../stores/user_store'; +import UserActions from '../../../../../actions/user_actions'; import { getLangText } from '../../../../../utils/lang_utils'; @@ -20,6 +21,7 @@ let IkonotvLanding = React.createClass({ componentDidMount() { UserStore.listen(this.onChange); + UserActions.fetchCurrentUser(); }, componentWillUnmount() { @@ -32,7 +34,7 @@ let IkonotvLanding = React.createClass({ getEnterButton() { let redirect = 'login'; - + console.log(this.state) if(this.state.currentUser && this.state.currentUser.email) { redirect = 'pieces'; } From 2dda22d84816c0d0432a1835b3e4dd9adc370620 Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 28 Sep 2015 16:57:46 +0200 Subject: [PATCH 3/4] fix: ikonotv redirect to collection if logged in --- .../whitelabel/wallet/components/ikonotv/ikonotv_landing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js index 0f5d129a..57abc5db 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js @@ -34,7 +34,7 @@ let IkonotvLanding = React.createClass({ getEnterButton() { let redirect = 'login'; - console.log(this.state) + if(this.state.currentUser && this.state.currentUser.email) { redirect = 'pieces'; } From 9bb5a51fed1cf2f169928a737306fd65e7b4fa5e Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 28 Sep 2015 17:11:15 +0200 Subject: [PATCH 4/4] bug fix show public note for anonymous --- js/components/ascribe_detail/note.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/ascribe_detail/note.js b/js/components/ascribe_detail/note.js index b377ff5c..c739b937 100644 --- a/js/components/ascribe_detail/note.js +++ b/js/components/ascribe_detail/note.js @@ -39,7 +39,7 @@ let Note = React.createClass({ }, render() { - if (!!this.props.currentUser.username && this.props.show) { + if ((!!this.props.currentUser.username && this.props.editable || !this.props.editable ) && this.props.show) { return (