From f1bc400faf18df0a4942fb9a63f754ccc681702f Mon Sep 17 00:00:00 2001
From: diminator <dimi.dejonghe@gmail.com>
Date: Tue, 22 Sep 2015 17:23:19 +0200
Subject: [PATCH] acls on 3 levels

whitelabel
user
piece

the higher on the list, the more power (whitelabel overrides user and piece)
---
 js/components/ascribe_settings/contract_settings.js       | 2 +-
 .../ascribe_accordion_list/accordion_list_item_prize.js   | 2 +-
 .../components/ascribe_detail/wallet_action_panel.js      | 2 +-
 .../ascribe_accordion_list/cyland_accordion_list_item.js  | 6 +++---
 .../ascribe_accordion_list/ikonotv_accordion_list_item.js | 8 ++++----
 .../wallet/components/ikonotv/ikonotv_register_piece.js   | 2 +-
 js/components/whitelabel/wallet/wallet_routes.js          | 2 +-
 js/constants/application_constants.js                     | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/components/ascribe_settings/contract_settings.js b/js/components/ascribe_settings/contract_settings.js
index 39cb853d..d0ded734 100644
--- a/js/components/ascribe_settings/contract_settings.js
+++ b/js/components/ascribe_settings/contract_settings.js
@@ -83,7 +83,7 @@ let ContractSettings = React.createClass({
 
         return (
             <AclProxy
-                aclName="acl_view_contract_settings"
+                aclName="acl_view_settings_contract"
                 aclObject={this.props.currentUser.acl}>
                 <CollapsibleParagraph
                     title={getLangText('Contracts')}
diff --git a/js/components/whitelabel/prize/components/ascribe_accordion_list/accordion_list_item_prize.js b/js/components/whitelabel/prize/components/ascribe_accordion_list/accordion_list_item_prize.js
index a2f34bba..7b3d5de0 100644
--- a/js/components/whitelabel/prize/components/ascribe_accordion_list/accordion_list_item_prize.js
+++ b/js/components/whitelabel/prize/components/ascribe_accordion_list/accordion_list_item_prize.js
@@ -124,7 +124,7 @@ let AccordionListItemPrize = React.createClass({
             <div>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_submit">
+                    aclName="acl_wallet_submit">
                     <SubmitToPrizeButton
                         className="pull-right"
                         piece={this.props.content}
diff --git a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
index 2a4ba61a..7d9286f0 100644
--- a/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
+++ b/js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
@@ -52,7 +52,7 @@ let WalletActionPanel = React.createClass({
                     handleSuccess={this.loadPiece}>
                     <AclProxy
                         aclObject={availableAcls}
-                        aclName="acl_submit">
+                        aclName="acl_wallet_submit">
                         <SubmitButtonType
                             className="btn-sm"
                             handleSuccess={this.handleSubmitSuccess}
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js b/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
index 72357f48..3e3676bc 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
@@ -63,7 +63,7 @@ let CylandAccordionListItem = React.createClass({
             <div>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_submit">
+                    aclName="acl_wallet_submit">
                     <CylandSubmitButton
                         className="pull-right"
                         piece={this.props.content}
@@ -71,7 +71,7 @@ let CylandAccordionListItem = React.createClass({
                 </AclProxy>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_submitted">
+                    aclName="acl_wallet_submitted">
                     <button
                     disabled
                     className="btn btn-default btn-xs pull-right">
@@ -81,7 +81,7 @@ let CylandAccordionListItem = React.createClass({
                 </AclProxy>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_accepted">
+                    aclName="acl_wallet_accepted">
                     <button
                     disabled
                     className="btn btn-default btn-xs pull-right">
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
index 85c4380a..8561cfae 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
@@ -64,10 +64,10 @@ let IkonotvAccordionListItem = React.createClass({
             <div>
                 <AclProxy
                     aclObject={this.state.currentUser.acl}
-                    aclName="acl_submit">
+                    aclName="acl_wallet_submit">
                     <AclProxy
                         aclObject={this.props.content.acl}
-                        aclName="acl_submit">
+                        aclName="acl_wallet_submit">
                         <IkonotvSubmitButton
                             className="btn-xs pull-right"
                             handleSuccess={this.handleSubmitSuccess}
@@ -76,7 +76,7 @@ let IkonotvAccordionListItem = React.createClass({
                 </AclProxy>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_submitted">
+                    aclName="acl_wallet_submitted">
                     <button
                     disabled
                     className="btn btn-default btn-xs pull-right">
@@ -86,7 +86,7 @@ let IkonotvAccordionListItem = React.createClass({
                 </AclProxy>
                 <AclProxy
                     aclObject={this.props.content.acl}
-                    aclName="acl_accepted">
+                    aclName="acl_wallet_accepted">
                     <button
                     disabled
                     className="btn btn-default btn-xs pull-right">
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
index b946d984..d7f2c73c 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
@@ -170,7 +170,7 @@ let IkonotvRegisterPiece = React.createClass({
 
     canSubmit() {
         let currentUser = this.state.currentUser;
-        return currentUser && currentUser.acl && currentUser.acl.acl_submit;
+        return currentUser && currentUser.acl && currentUser.acl.acl_wallet_submit;
     },
 
     getSlideArtistDetails() {
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index ab152e1b..075901bd 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -73,7 +73,7 @@ let ROUTES = {
             <Route name="logout" path="logout" handler={LogoutContainer} />
             <Route name="signup" path="signup" handler={SignupContainer} />
             <Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
-            <Route name="request_loan" path="request_loan" handler={IkonotvRequestLoan} headerTitle="SEND NEW CONTRACT" aclName="acl_send_contract" />
+            <Route name="request_loan" path="request_loan" handler={IkonotvRequestLoan} headerTitle="SEND NEW CONTRACT" aclName="acl_create_contractagreement" />
             <Route name="register_piece" path="register_piece" handler={IkonotvRegisterPiece} headerTitle="+ NEW WORK"/>
             <Route name="pieces" path="collection" handler={IkonotvPieceList} headerTitle="COLLECTION"/>
             <Route name="piece" path="pieces/:pieceId" handler={IkonotvPieceContainer} />
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index eeabce88..c74fdce9 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -12,7 +12,7 @@ let constants = {
     'baseUrl': window.BASE_URL,
     'aclList': ['acl_coa', 'acl_consign', 'acl_delete', 'acl_download', 'acl_edit', 'acl_create_editions', 'acl_view_editions',
                 'acl_loan', 'acl_share', 'acl_transfer', 'acl_unconsign', 'acl_unshare', 'acl_view',
-                'acl_withdraw_transfer', 'acl_submit'],
+                'acl_withdraw_transfer', 'acl_wallet_submit'],
 
     'version': 0.1,
     'csrftoken': 'csrftoken2',