diff --git a/js/actions/contract_agreement_list_actions.js b/js/actions/contract_agreement_list_actions.js
index 86988f47..f2959901 100644
--- a/js/actions/contract_agreement_list_actions.js
+++ b/js/actions/contract_agreement_list_actions.js
@@ -89,6 +89,17 @@ class ContractAgreementListActions {
});
}
+ flushContractAgreementList(){
+ return Q.Promise((resolve, reject) => {
+ this.actions.updateContractAgreementList(null).then(
+ resolve()
+ ).catch((err) => {
+ console.logGlobal(err);
+ reject(err);
+ });
+ });
+ }
+
}
export default alt.createActions(ContractAgreementListActions);
diff --git a/js/components/ascribe_buttons/acl_button.js b/js/components/ascribe_buttons/acl_button.js
index 084de194..e3c7fa1c 100644
--- a/js/components/ascribe_buttons/acl_button.js
+++ b/js/components/ascribe_buttons/acl_button.js
@@ -162,21 +162,24 @@ let AclButton = React.createClass({
},
render() {
- let shouldDisplay = this.props.availableAcls[this.props.action];
- let aclProps = this.actionProperties();
- let buttonClassName = this.props.buttonAcceptClassName ? this.props.buttonAcceptClassName : '';
- return (
-
+ {getLangText('No private contracts found, please go to the ')} + {getLangText('settings page')} + {getLangText(' and create them.')} +
+{appendix.default} @@ -99,6 +103,13 @@ let IkonotvContractNotifications = React.createClass({ return null; }, + handleConfirm() { + let contractAgreement = this.state.contractAgreementListNotifications[0].contract_agreement; + requests.put(apiUrls.ownership_contract_agreements_confirm, {contract_agreement_id: contractAgreement.id}).then( + () => this.handleConfirmSuccess() + ); + }, + handleConfirmSuccess() { let notification = new GlobalNotificationModel(getLangText('You have accepted the conditions'), 'success', 10000); GlobalNotificationActions.appendGlobalNotification(notification); @@ -118,11 +129,29 @@ let IkonotvContractNotifications = React.createClass({ this.transitionTo('pieces'); }, + getCopyrightAssociationForm(){ + if (this.state.currentUser && this.state.currentUser.profile + && this.state.currentUser.profile.copyright_association){ + return null; + } + return ( +++ ); + }, + render() { if (this.state.contractAgreementListNotifications && this.state.contractAgreementListNotifications.length > 0) { - let contractAgreement = this.state.contractAgreementListNotifications[0].contract_agreement; return ({getLangText('Are you a member of any copyright societies?')}
++ ARS, DACS, Bildkunst, Pictoright, SODRAC, Copyright Agency/Viscopy, SAVA, Bildrecht GmbH, + SABAM, AUTVIS, CREAIMAGEN, SONECA, Copydan, EAU, Kuvasto, GCA, HUNGART, IVARO, SIAE, JASPAR-SPDA, + AKKA/LAA, LATGA-A, SOMAAP, ARTEGESTION, CARIER, BONO, APSAV, SPA, GESTOR, VISaRTA, RAO, LITA, + DALRO, VeGaP, BUS, ProLitteris, AGADU, AUTORARTE, BUBEDRA, BBDA, BCDA, BURIDA, ADAVIS, BSDA +
++ {this.getContract()} -@@ -133,41 +162,17 @@ let IkonotvContractNotifications = React.createClass({- {this.getAppendix} -{getLangText('Are you a member of any copyright societies?')}
-- ARS, DACS, Bildkunst, Pictoright, SODRAC, Copyright Agency/Viscopy, SAVA, Bildrecht GmbH, - SABAM, AUTVIS, CREAIMAGEN, SONECA, Copydan, EAU, Kuvasto, GCA, HUNGART, IVARO, SIAE, JASPAR-SPDA, - AKKA/LAA, LATGA-A, SOMAAP, ARTEGESTION, CARIER, BONO, APSAV, SPA, GESTOR, VISaRTA, RAO, LITA, - DALRO, VeGaP, BUS, ProLitteris, AGADU, AUTORARTE, BUBEDRA, BBDA, BCDA, BURIDA, ADAVIS, BSDA + {this.getAppendix()} + {this.getCopyrightAssociationForm()} +
+ +
-