From c0e0354ce832f106747f68f6a0d135a08d088a8f Mon Sep 17 00:00:00 2001 From: Cevo Date: Fri, 20 Nov 2015 11:11:03 +0100 Subject: [PATCH 1/5] fixing the public note bug --- js/components/ascribe_detail/piece_container.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 8cd7df1c..1914e3af 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -57,6 +57,7 @@ let PieceContainer = React.createClass({ mixins: [History], getInitialState() { + console.log('Piece initially ... ', PieceStore.getState()); return mergeOptions( UserStore.getState(), PieceListStore.getState(), @@ -103,7 +104,6 @@ let PieceContainer = React.createClass({ let pieceState = mergeOptions({}, state.piece); pieceState.acl.acl_loan = false; - this.setState({ piece: pieceState }); @@ -273,14 +273,17 @@ let PieceContainer = React.createClass({ currentUser={this.state.currentUser}/> + {console.log('hey')} + {console.log(this.state.piece)} + {console.log(this.state.piece.acl.acl_edit)} Date: Fri, 20 Nov 2015 11:47:41 +0100 Subject: [PATCH 2/5] piece note hidden from non-owner --- js/components/ascribe_detail/piece_container.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 1914e3af..d0ca2e1e 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -57,7 +57,6 @@ let PieceContainer = React.createClass({ mixins: [History], getInitialState() { - console.log('Piece initially ... ', PieceStore.getState()); return mergeOptions( UserStore.getState(), PieceListStore.getState(), @@ -252,7 +251,6 @@ let PieceContainer = React.createClass({ } buttons={this.getActions()}> {this.getCreateEditionsDialog()} - 0}> @@ -261,7 +259,8 @@ let PieceContainer = React.createClass({ + show={(!!(this.state.currentUser.username || this.state.piece.public_note)) && + (!!this.state.piece.acl.acl_edit)}> - {console.log('hey')} - {console.log(this.state.piece)} - {console.log(this.state.piece.acl.acl_edit)} Date: Wed, 25 Nov 2015 21:43:15 +0100 Subject: [PATCH 3/5] public note is visible outside --- js/components/ascribe_detail/piece_container.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index d0ca2e1e..6fb7b16c 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -259,12 +259,12 @@ let PieceContainer = React.createClass({ + show={(!!(this.state.currentUser.username || this.state.piece.public_note))}> Date: Wed, 2 Dec 2015 16:51:56 +0100 Subject: [PATCH 4/5] Fix render bug for personal piece note --- js/components/ascribe_collapsible/collapsible_paragraph.js | 4 +++- js/components/ascribe_detail/edition.js | 2 +- js/components/ascribe_detail/piece_container.js | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/js/components/ascribe_collapsible/collapsible_paragraph.js b/js/components/ascribe_collapsible/collapsible_paragraph.js index e146b42b..7ad8d0af 100644 --- a/js/components/ascribe_collapsible/collapsible_paragraph.js +++ b/js/components/ascribe_collapsible/collapsible_paragraph.js @@ -12,7 +12,9 @@ const CollapsibleParagraph = React.createClass({ React.PropTypes.object, React.PropTypes.array ]), - iconName: React.PropTypes.string + iconName: React.PropTypes.string, + show: React.PropTypes.bool, + defaultExpanded: React.PropTypes.bool }, getDefaultProps() { diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 254746a6..78989648 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -136,7 +136,7 @@ let Edition = React.createClass({ currentUser={this.state.currentUser}/> {return {'bitcoin_id': this.props.edition.bitcoin_id}; }} - label={getLangText('Edition note (public)')} + label={getLangText('Personal note (public)')} defaultValue={this.props.edition.public_note ? this.props.edition.public_note : null} placeholder={getLangText('Enter your comments ...')} editable={!!this.props.edition.acl.acl_edit} diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 8cfbd1c7..73d44c66 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -258,7 +258,9 @@ let PieceContainer = React.createClass({ + show={!!(this.state.currentUser.username + || this.state.piece.acl.acl_edit + || this.state.piece.public_note)}> From d2aba04bea74a88c8cf08ea86a5f86972e116f5a Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Mon, 7 Dec 2015 10:52:00 +0100 Subject: [PATCH 5/5] Change show condition on public note to be more stylistically similar --- js/components/ascribe_detail/piece_container.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js index 73d44c66..ca7c83a7 100644 --- a/js/components/ascribe_detail/piece_container.js +++ b/js/components/ascribe_detail/piece_container.js @@ -277,7 +277,7 @@ let PieceContainer = React.createClass({ defaultValue={this.state.piece.public_note || null} placeholder={getLangText('Enter your comments ...')} editable={!!this.state.piece.acl.acl_edit} - show={!!this.state.piece.public_note || !!this.state.piece.acl.acl_edit} + show={!!(this.state.piece.public_note || this.state.piece.acl.acl_edit)} successMessage={getLangText('Public note saved')} url={ApiUrls.note_public_piece} currentUser={this.state.currentUser}/>