ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Revert "acls on 3 levels"

Browse Source 
This reverts commit f1bc400faf.
This commit is contained in:
Tim Daubenschütz 2015-09-22 17:29:07 +02:00
parent 24b7031c72
commit c02d1ea3ac
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_settings/contract_settings.js
View File

@ -83,7 +83,7 @@ let ContractSettings = React.createClass({
return ( return (
<AclProxy <AclProxy
aclName="acl_view_settings_contract" aclName="acl_view_contract_settings"
aclObject={this.props.currentUser.acl}> aclObject={this.props.currentUser.acl}>
<CollapsibleParagraph <CollapsibleParagraph
title={getLangText('Contracts')} title={getLangText('Contracts')}

2
js/components/whitelabel/prize/components/ascribe_accordion_list/accordion_list_item_prize.js
View File

@ -124,7 +124,7 @@ let AccordionListItemPrize = React.createClass({
<div> <div>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_submit"> aclName="acl_submit">
<SubmitToPrizeButton <SubmitToPrizeButton
className="pull-right" className="pull-right"
piece={this.props.content} piece={this.props.content}

2
js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
View File

@ -52,7 +52,7 @@ let WalletActionPanel = React.createClass({
handleSuccess={this.loadPiece}> handleSuccess={this.loadPiece}>
<AclProxy <AclProxy
aclObject={availableAcls} aclObject={availableAcls}
aclName="acl_wallet_submit"> aclName="acl_submit">
<SubmitButtonType <SubmitButtonType
className="btn-sm" className="btn-sm"
handleSuccess={this.handleSubmitSuccess} handleSuccess={this.handleSubmitSuccess}

6
js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js
View File

@ -63,7 +63,7 @@ let CylandAccordionListItem = React.createClass({
<div> <div>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_submit"> aclName="acl_submit">
<CylandSubmitButton <CylandSubmitButton
className="pull-right" className="pull-right"
piece={this.props.content} piece={this.props.content}
@ -71,7 +71,7 @@ let CylandAccordionListItem = React.createClass({
</AclProxy> </AclProxy>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_submitted"> aclName="acl_submitted">
<button <button
disabled disabled
className="btn btn-default btn-xs pull-right"> className="btn btn-default btn-xs pull-right">
@ -81,7 +81,7 @@ let CylandAccordionListItem = React.createClass({
</AclProxy> </AclProxy>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_accepted"> aclName="acl_accepted">
<button <button
disabled disabled
className="btn btn-default btn-xs pull-right"> className="btn btn-default btn-xs pull-right">

8
js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
View File

@ -64,10 +64,10 @@ let IkonotvAccordionListItem = React.createClass({
<div> <div>
<AclProxy <AclProxy
aclObject={this.state.currentUser.acl} aclObject={this.state.currentUser.acl}
aclName="acl_wallet_submit"> aclName="acl_submit">
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_submit"> aclName="acl_submit">
<IkonotvSubmitButton <IkonotvSubmitButton
className="btn-xs pull-right" className="btn-xs pull-right"
handleSuccess={this.handleSubmitSuccess} handleSuccess={this.handleSubmitSuccess}
@ -76,7 +76,7 @@ let IkonotvAccordionListItem = React.createClass({
</AclProxy> </AclProxy>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_submitted"> aclName="acl_submitted">
<button <button
disabled disabled
className="btn btn-default btn-xs pull-right"> className="btn btn-default btn-xs pull-right">
@ -86,7 +86,7 @@ let IkonotvAccordionListItem = React.createClass({
</AclProxy> </AclProxy>
<AclProxy <AclProxy
aclObject={this.props.content.acl} aclObject={this.props.content.acl}
aclName="acl_wallet_accepted"> aclName="acl_accepted">
<button <button
disabled disabled
className="btn btn-default btn-xs pull-right"> className="btn btn-default btn-xs pull-right">

2
js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js
View File

@ -170,7 +170,7 @@ let IkonotvRegisterPiece = React.createClass({
canSubmit() { canSubmit() {
let currentUser = this.state.currentUser; let currentUser = this.state.currentUser;
return currentUser && currentUser.acl && currentUser.acl.acl_wallet_submit; return currentUser && currentUser.acl && currentUser.acl.acl_submit;
}, },
getSlideArtistDetails() { getSlideArtistDetails() {

2
js/components/whitelabel/wallet/wallet_routes.js
View File

@ -73,7 +73,7 @@ let ROUTES = {
<Route name="logout" path="logout" handler={LogoutContainer} /> <Route name="logout" path="logout" handler={LogoutContainer} />
<Route name="signup" path="signup" handler={SignupContainer} /> <Route name="signup" path="signup" handler={SignupContainer} />
<Route name="password_reset" path="password_reset" handler={PasswordResetContainer} /> <Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
<Route name="request_loan" path="request_loan" handler={IkonotvRequestLoan} headerTitle="SEND NEW CONTRACT" aclName="acl_create_contractagreement" /> <Route name="request_loan" path="request_loan" handler={IkonotvRequestLoan} headerTitle="SEND NEW CONTRACT" aclName="acl_send_contract" />
<Route name="register_piece" path="register_piece" handler={IkonotvRegisterPiece} headerTitle="+ NEW WORK"/> <Route name="register_piece" path="register_piece" handler={IkonotvRegisterPiece} headerTitle="+ NEW WORK"/>
<Route name="pieces" path="collection" handler={IkonotvPieceList} headerTitle="COLLECTION"/> <Route name="pieces" path="collection" handler={IkonotvPieceList} headerTitle="COLLECTION"/>
<Route name="piece" path="pieces/:pieceId" handler={IkonotvPieceContainer} /> <Route name="piece" path="pieces/:pieceId" handler={IkonotvPieceContainer} />

2
js/constants/application_constants.js
View File

@ -12,7 +12,7 @@ let constants = {
'baseUrl': window.BASE_URL, 'baseUrl': window.BASE_URL,
'aclList': ['acl_coa', 'acl_consign', 'acl_delete', 'acl_download', 'acl_edit', 'acl_create_editions', 'acl_view_editions', '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_loan', 'acl_share', 'acl_transfer', 'acl_unconsign', 'acl_unshare', 'acl_view',
'acl_withdraw_transfer', 'acl_wallet_submit'], 'acl_withdraw_transfer', 'acl_submit'],
'version': 0.1, 'version': 0.1,
'csrftoken': 'csrftoken2', 'csrftoken': 'csrftoken2',