From 7a09b863b549bb366c6340d81d6ed3a3626068ac Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Fri, 21 Aug 2015 16:49:04 +0200
Subject: [PATCH 1/6] switch between request action and acl buttons on piece
 detail page

---
 .../ascribe_detail/piece_container.js         | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js
index fa17d82c..dc8e5569 100644
--- a/js/components/ascribe_detail/piece_container.js
+++ b/js/components/ascribe_detail/piece_container.js
@@ -26,6 +26,8 @@ import CreateEditionsForm from '../ascribe_forms/create_editions_form';
 import CreateEditionsButton from '../ascribe_buttons/create_editions_button';
 import DeleteButton from '../ascribe_buttons/delete_button';
 
+import RequestActionForm from '../ascribe_forms/form_request_action';
+
 import GlobalNotificationModel from '../../models/global_notification_model';
 import GlobalNotificationActions from '../../actions/global_notification_actions';
 
@@ -148,6 +150,34 @@ let PieceContainer = React.createClass({
         return {'id': this.state.piece.id};
     },
 
+    getActions(){
+        if (this.state.piece.request_action && this.state.piece.request_action.length > 0) {
+            return (
+                <RequestActionForm
+                    currentUser={this.state.currentUser}
+                    editions={ [this.state.piece] }
+                    handleSuccess={this.showNotification}/>);
+        }
+        else {
+            return (
+                <AclButtonList
+                    className="text-center ascribe-button-list"
+                    availableAcls={this.state.piece.acl}
+                    editions={this.state.piece}
+                    handleSuccess={this.loadPiece}>
+                        <CreateEditionsButton
+                            label={getLangText('CREATE EDITIONS')}
+                            className="btn-sm"
+                            piece={this.state.piece}
+                            toggleCreateEditionsDialog={this.toggleCreateEditionsDialog}
+                            onPollingSuccess={this.handlePollingSuccess}/>
+                        <DeleteButton
+                            handleSuccess={this.handleDeleteSuccess}
+                            piece={this.state.piece}/>
+                </AclButtonList>
+            );
+        }
+    },
     render() {
         if('title' in this.state.piece) {
             return (
@@ -170,23 +200,7 @@ let PieceContainer = React.createClass({
                             <DetailProperty label={getLangText('ID')} value={ this.state.piece.bitcoin_id } ellipsis={true} />
                         </div>
                     }
-                    buttons={
-                        <AclButtonList
-                            className="text-center ascribe-button-list"
-                            availableAcls={this.state.piece.acl}
-                            editions={this.state.piece}
-                            handleSuccess={this.loadPiece}>
-                                <CreateEditionsButton
-                                    label={getLangText('CREATE EDITIONS')}
-                                    className="btn-sm"
-                                    piece={this.state.piece}
-                                    toggleCreateEditionsDialog={this.toggleCreateEditionsDialog}
-                                    onPollingSuccess={this.handlePollingSuccess}/>
-                                <DeleteButton
-                                    handleSuccess={this.handleDeleteSuccess}
-                                    piece={this.state.piece}/>
-                        </AclButtonList>
-                    }>
+                    buttons={this.getActions()}>
                     {this.getCreateEditionsDialog()}
 
                     <CollapsibleParagraph

From 3b27238adf75606272f1fbecb50c75de991d315b Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 24 Aug 2015 10:48:40 +0200
Subject: [PATCH 2/6] request form on piece level bug fix cyland piece endpoint
 bug fix otherDataUploader editable

---
 js/components/ascribe_detail/edition.js       |  4 +-
 .../ascribe_detail/further_details.js         |  1 +
 .../further_details_fileuploader.js           |  1 +
 .../ascribe_detail/piece_container.js         |  8 ++-
 .../ascribe_forms/form_request_action.js      | 60 +++++++++++--------
 js/constants/api_urls.js                      |  2 +
 6 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js
index 2675d804..9d2af633 100644
--- a/js/components/ascribe_detail/edition.js
+++ b/js/components/ascribe_detail/edition.js
@@ -242,7 +242,9 @@ let EditionSummary = React.createClass({
             actions = (
                 <RequestActionForm
                     currentUser={this.props.currentUser}
-                    editions={ [this.props.edition] }
+                    pieceOrEditions={ [this.props.edition] }
+                    requestAction={this.props.edition.request_action}
+                    requestUser={this.props.edition.owner}
                     handleSuccess={this.showNotification}/>);
         }
 
diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js
index d206a3be..9fc5bf15 100644
--- a/js/components/ascribe_detail/further_details.js
+++ b/js/components/ascribe_detail/further_details.js
@@ -82,6 +82,7 @@ let FurtherDetails = React.createClass({
                             setIsUploadReady={this.setIsUploadReady}
                             isReadyForFormSubmission={isReadyForFormSubmission}
                             editable={this.props.editable}
+                            overrideForm={true}
                             pieceId={this.props.pieceId}
                             otherData={this.props.otherData}
                             multiple={true}/>
diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js
index 2b04a210..a6eea898 100644
--- a/js/components/ascribe_detail/further_details_fileuploader.js
+++ b/js/components/ascribe_detail/further_details_fileuploader.js
@@ -30,6 +30,7 @@ let FurtherDetailsFileuploader = React.createClass({
     },
 
     render() {
+        console.log(this.props)
         // Essentially there a three cases important to the fileuploader
         //
         // 1. there is no other_data => do not show the fileuploader at all
diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js
index dc8e5569..bb528a56 100644
--- a/js/components/ascribe_detail/piece_container.js
+++ b/js/components/ascribe_detail/piece_container.js
@@ -151,11 +151,15 @@ let PieceContainer = React.createClass({
     },
 
     getActions(){
-        if (this.state.piece.request_action && this.state.piece.request_action.length > 0) {
+        if (this.state.piece &&
+            this.state.piece.request_action &&
+            this.state.piece.request_action.length > 0) {
             return (
                 <RequestActionForm
                     currentUser={this.state.currentUser}
-                    editions={ [this.state.piece] }
+                    pieceOrEditions={ this.state.piece }
+                    requestAction={this.state.piece.request_action}
+                    requestUser={this.state.piece.user_registered}
                     handleSuccess={this.showNotification}/>);
         }
         else {
diff --git a/js/components/ascribe_forms/form_request_action.js b/js/components/ascribe_forms/form_request_action.js
index cc4ad88a..3b98a637 100644
--- a/js/components/ascribe_forms/form_request_action.js
+++ b/js/components/ascribe_forms/form_request_action.js
@@ -16,40 +16,49 @@ import { getLangText } from '../../utils/lang_utils.js';
 
 let RequestActionForm = React.createClass({
     propTypes: {
-        editions: React.PropTypes.arrayOf(React.PropTypes.object),
+        pieceOrEditions: React.PropTypes.oneOfType([
+            React.PropTypes.object,
+            React.PropTypes.array
+        ]).isRequired,
+        requestAction: React.PropTypes.string,
+        requestUser: React.PropTypes.string,
         currentUser: React.PropTypes.object,
         handleSuccess: React.PropTypes.func
     },
 
+    isPiece(){
+        return this.props.pieceOrEditions.constructor !== Array;
+    },
+
     getUrls() {
-        let edition = this.props.editions[0];
         let urls = {};
 
-
-        if (edition.request_action === 'consign'){
+        if (this.props.requestAction === 'consign'){
             urls.accept = ApiUrls.ownership_consigns_confirm;
             urls.deny = ApiUrls.ownership_consigns_deny;
-        } else if (edition.request_action === 'unconsign'){
+        } else if (this.props.requestAction === 'unconsign'){
             urls.accept = ApiUrls.ownership_unconsigns;
             urls.deny = ApiUrls.ownership_unconsigns_deny;
-        } else if (edition.request_action === 'loan'){
+        } else if (this.props.requestAction === 'loan' && !this.isPiece()){
             urls.accept = ApiUrls.ownership_loans_confirm;
             urls.deny = ApiUrls.ownership_loans_deny;
+        } else if (this.props.requestAction === 'loan' && this.isPiece()){
+            urls.accept = ApiUrls.ownership_loans_pieces_confirm;
+            urls.deny = ApiUrls.ownership_loans_pieces_deny;
         }
 
         return urls;
     },
 
-    getBitcoinIds(){
-        return this.props.editions.map(function(edition){
-            return edition.bitcoin_id;
-        });
-    },
-
-    getFormData() {
-        return {
-            bitcoin_id: this.getBitcoinIds().join()
-        };
+    getFormData(){
+        if (this.isPiece()) {
+            return {piece_id: this.props.pieceOrEditions.id};
+        }
+        else {
+            return {bitcoin_id: this.props.pieceOrEditions.map(function(edition){
+                return edition.bitcoin_id;
+            }).join()};
+        }
     },
 
     showNotification(option, action, owner) {
@@ -66,8 +75,7 @@ let RequestActionForm = React.createClass({
     },
 
     getContent() {
-        let edition = this.props.editions[0];
-        let message = edition.owner + ' ' + getLangText('requests you') + ' ' + edition.request_action + ' ' + getLangText('this edition%s', '.');
+        let message = this.props.requestUser + ' ' + getLangText('requests you') + ' ' + this.props.requestAction + ' ' + getLangText('this edition%s', '.');
 
         return (
             <span>
@@ -77,14 +85,12 @@ let RequestActionForm = React.createClass({
     },
 
     getAcceptButtonForm(urls) {
-        let edition = this.props.editions[0];
-
-        if(edition.request_action === 'unconsign') {
+        if(this.props.requestAction === 'unconsign') {
             return (
                 <AclButton
                     availableAcls={{'acl_unconsign': true}}
                     action="acl_unconsign"
-                    pieceOrEditions={this.props.editions}
+                    pieceOrEditions={this.props.pieceOrEditions}
                     currentUser={this.props.currentUser}
                     handleSuccess={this.props.handleSuccess} />
                 );
@@ -93,7 +99,9 @@ let RequestActionForm = React.createClass({
                 <Form
                     url={urls.accept}
                     getFormData={this.getFormData}
-                    handleSuccess={this.showNotification(getLangText('accepted'), edition.request_action, edition.owner)}
+                    handleSuccess={
+                        this.showNotification(getLangText('accepted'), this.props.requestAction, this.props.requestUser)
+                    }
                     isInline={true}
                     className='inline pull-right'>
                     <button
@@ -107,8 +115,6 @@ let RequestActionForm = React.createClass({
     },
 
     getButtonForm() {
-        let edition = this.props.editions[0];
-
         let urls = this.getUrls();
         let acceptButtonForm = this.getAcceptButtonForm(urls);
 
@@ -118,7 +124,9 @@ let RequestActionForm = React.createClass({
                     url={urls.deny}
                     isInline={true}
                     getFormData={this.getFormData}
-                    handleSuccess={this.showNotification(getLangText('denied'), edition.request_action, edition.owner)}
+                    handleSuccess={
+                        this.showNotification(getLangText('denied'), this.props.requestAction, this.props.requestUser)
+                    }
                     className='inline pull-right'>
                     <button
                         type="submit"
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index 8e2545e7..a1ed9a1d 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -30,6 +30,8 @@ let ApiUrls = {
     'ownership_consigns_confirm': AppConstants.apiEndpoint + 'ownership/consigns/confirm/',
     'ownership_consigns_deny': AppConstants.apiEndpoint + 'ownership/consigns/deny/',
     'ownership_loans_pieces': AppConstants.apiEndpoint + 'ownership/loans/pieces/',
+    'ownership_loans_pieces_confirm': AppConstants.apiEndpoint + 'ownership/loans/pieces/confirm/',
+    'ownership_loans_pieces_deny': AppConstants.apiEndpoint + 'ownership/loans/pieces/deny/',
     'ownership_loans_editions': AppConstants.apiEndpoint + 'ownership/loans/editions/',
     'ownership_loans_confirm': AppConstants.apiEndpoint + 'ownership/loans/editions/confirm/',
     'ownership_loans_deny': AppConstants.apiEndpoint + 'ownership/loans/editions/deny/',

From 0be6b7f118aa6632839ff2ae1fdbd14ca9033aa1 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 24 Aug 2015 11:01:42 +0200
Subject: [PATCH 3/6] bug fix loadPiece

---
 js/components/ascribe_detail/further_details_fileuploader.js | 1 -
 js/components/ascribe_detail/piece_container.js              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js
index a6eea898..2b04a210 100644
--- a/js/components/ascribe_detail/further_details_fileuploader.js
+++ b/js/components/ascribe_detail/further_details_fileuploader.js
@@ -30,7 +30,6 @@ let FurtherDetailsFileuploader = React.createClass({
     },
 
     render() {
-        console.log(this.props)
         // Essentially there a three cases important to the fileuploader
         //
         // 1. there is no other_data => do not show the fileuploader at all
diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js
index bb528a56..fe1a6c8a 100644
--- a/js/components/ascribe_detail/piece_container.js
+++ b/js/components/ascribe_detail/piece_container.js
@@ -160,7 +160,7 @@ let PieceContainer = React.createClass({
                     pieceOrEditions={ this.state.piece }
                     requestAction={this.state.piece.request_action}
                     requestUser={this.state.piece.user_registered}
-                    handleSuccess={this.showNotification}/>);
+                    handleSuccess={this.loadPiece}/>);
         }
         else {
             return (

From 54ec8295883b9ce6fb89236fe75eb5828050d9a2 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 24 Aug 2015 11:35:35 +0200
Subject: [PATCH 4/6] notes in cyland

---
 .../ascribe_detail/cyland_piece_container.js  | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
index 2da39a72..b9098e13 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
+++ b/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
@@ -17,10 +17,13 @@ import InputTextAreaToggable from '../../../../../../components/ascribe_forms/in
 import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
 
 import HistoryIterator from '../../../../../ascribe_detail/history_iterator';
+import Note from '../../../../../ascribe_detail/note';
 
 import FurtherDetailsFileuploader from '../../../../../ascribe_detail/further_details_fileuploader';
 import DetailProperty from '../../../../../ascribe_detail/detail_property';
 
+import ApiUrls from '../../../../../../constants/api_urls';
+
 import { getLangText } from '../../../../../../utils/lang_utils';
 import { mergeOptions } from '../../../../../../utils/general_utils';
 
@@ -39,6 +42,13 @@ let CylandPieceContainer = React.createClass({
         UserStore.listen(this.onChange);
     },
 
+    componentWillReceiveProps(nextProps) {
+        if(this.props.params.pieceId !== nextProps.params.pieceId) {
+            PieceActions.updatePiece({});
+            PieceActions.fetchOne(nextProps.params.pieceId);
+        }
+    },
+
     componentWillUnmount() {
         // Every time we're leaving the piece detail page,
         // just reset the piece that is saved in the piece store
@@ -49,13 +59,6 @@ let CylandPieceContainer = React.createClass({
         UserStore.unlisten(this.onChange);
     },
 
-    componentWillReceiveProps(nextProps) {
-        if(this.props.params.pieceId !== nextProps.params.pieceId) {
-            PieceActions.updatePiece({});
-            PieceActions.fetchOne(nextProps.params.pieceId);
-        }
-    },
-
     onChange(state) {
         this.setState(state);
     },
@@ -64,6 +67,11 @@ let CylandPieceContainer = React.createClass({
         PieceActions.fetchOne(this.props.params.pieceId);
     },
 
+    getId() {
+        return {'id': this.state.piece.id};
+    },
+
+
     render() {
         if('title' in this.state.piece) {
             return (
@@ -93,7 +101,20 @@ let CylandPieceContainer = React.createClass({
                         <HistoryIterator
                             history={this.state.piece.loan_history} />
                     </CollapsibleParagraph>
-
+                    <CollapsibleParagraph
+                        title={getLangText('Notes')}
+                        show={(this.state.currentUser.username && true || false) ||
+                                (this.state.piece.public_note)}>
+                        <Note
+                            id={this.getId}
+                            label={getLangText('Personal note (private)')}
+                            defaultValue={this.state.piece.private_note ? this.state.piece.private_note : null}
+                            placeholder={getLangText('Enter your comments ...')}
+                            editable={true}
+                            successMessage={getLangText('Private note saved')}
+                            url={ApiUrls.note_private_piece}
+                            currentUser={this.state.currentUser}/>
+                    </CollapsibleParagraph>
                     <CylandPieceDetails piece={this.state.piece}/>
                 </Piece>
             );

From 411b7cb010939277ae40a4598162dc701e298507 Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 24 Aug 2015 12:11:07 +0200
Subject: [PATCH 5/6] increase otherdata limit to 50MB

---
 js/components/ascribe_detail/further_details_fileuploader.js | 4 ++--
 js/components/settings_container.js                          | 2 +-
 js/utils/lang_utils.js                                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/components/ascribe_detail/further_details_fileuploader.js b/js/components/ascribe_detail/further_details_fileuploader.js
index 8c1023ba..fa1df933 100644
--- a/js/components/ascribe_detail/further_details_fileuploader.js
+++ b/js/components/ascribe_detail/further_details_fileuploader.js
@@ -43,7 +43,7 @@ let FurtherDetailsFileuploader = React.createClass({
 
         return (
             <Property
-                label="Additional files (max. 10MB)">
+                label="Additional files (max. 50MB per file)">
                 <ReactS3FineUploader
                     uploadStarted={this.props.uploadStarted}
                     keyRoutine={{
@@ -57,7 +57,7 @@ let FurtherDetailsFileuploader = React.createClass({
                     }}
                     validation={{
                         itemLimit: 100000,
-                        sizeLimit: '10000000'
+                        sizeLimit: '50000000'
                     }}
                     submitKey={this.props.submitKey}
                     setIsUploadReady={this.props.setIsUploadReady}
diff --git a/js/components/settings_container.js b/js/components/settings_container.js
index f26e6472..96ca3b3b 100644
--- a/js/components/settings_container.js
+++ b/js/components/settings_container.js
@@ -270,7 +270,7 @@ let FileUploader = React.createClass({
                         }}
                         validation={{
                             itemLimit: 100000,
-                            sizeLimit: '10000000'
+                            sizeLimit: '50000000'
                         }}
                         session={{
                             endpoint: ApiUrls.ownership_loans_contract,
diff --git a/js/utils/lang_utils.js b/js/utils/lang_utils.js
index 6f0336c2..f2e2fa14 100644
--- a/js/utils/lang_utils.js
+++ b/js/utils/lang_utils.js
@@ -30,7 +30,7 @@ export function getLangText(s, ...args) {
     } catch(err) {
         //if(!(s in languages[lang])) {
         //console.warn('Language-string is not in constants file. Add: "' + s + '" to the "' + lang + '" language file. Defaulting to keyname');
-        return s;
+        return formatText(s, args);
         //} else {
         //    console.error(err);
         //}

From b76c752966996aefdaa2d9975e2c2f717c6dd40a Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Mon, 24 Aug 2015 12:20:54 +0200
Subject: [PATCH 6/6] Merge remote-tracking branch 'remotes/origin/master' into
 AD-661-due-1208-implement-jury-rating-an

Conflicts:
	ownership/test/test_api.py
	piece/models.py
---
 js/components/ascribe_uploader/react_s3_fine_uploader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index f97308ab..fa5f855e 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -527,7 +527,7 @@ var ReactS3FineUploader = React.createClass({
     },
 
     handleDeleteFile(fileId) {
-        // In some instances (when the file was already uploaded and is just displayed to the user 
+        // In some instances (when the file was already uploaded and is just displayed to the user
         // - for example in the loan contract or additional files dialog)
         // fineuploader does not register an id on the file (we do, don't be confused by this!).
         // Since you can only delete a file by its id, we have to implement this method ourselves