From 84c459c4265047a58a989dcc18312346a5f3fdf7 Mon Sep 17 00:00:00 2001 From: Brett Sun Date: Mon, 26 Oct 2015 11:09:04 +0100 Subject: [PATCH] Revert changes to allow piece list to filter ACLs We can do this with the backend instead. --- .../piece_list_bulk_modal.js | 9 +-------- js/components/piece_list.js | 4 +--- .../wallet/components/lumenus/lumenus_piece_list.js | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js index 2a4d4301..3f2217e6 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js @@ -22,16 +22,9 @@ import { getLangText } from '../../utils/lang_utils.js'; let PieceListBulkModal = React.createClass({ propTypes: { - aclFilterBy: React.PropTypes.func, className: React.PropTypes.string }, - getDefaultProps() { - return { - aclFilterBy: (aclName) => aclName !== 'acl_view' - }; - }, - getInitialState() { return mergeOptions( EditionListStore.getState(), @@ -100,7 +93,7 @@ let PieceListBulkModal = React.createClass({ render() { let selectedEditions = this.fetchSelectedEditionList(); - let availableAcls = getAvailableAcls(selectedEditions, this.props.aclFilterBy); + let availableAcls = getAvailableAcls(selectedEditions, (aclName) => aclName !== 'acl_view'); if(Object.keys(availableAcls).length > 0) { return ( diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 07a9d47e..c427a911 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -32,7 +32,6 @@ import { setDocumentTitle } from '../utils/dom_utils'; let PieceList = React.createClass({ propTypes: { accordionListItemType: React.PropTypes.func, - aclFilterBy: React.PropTypes.func, redirectTo: React.PropTypes.string, customSubmitButton: React.PropTypes.element, filterParams: React.PropTypes.array, @@ -179,8 +178,7 @@ let PieceList = React.createClass({ } + className="ascribe-piece-list-bulk-modal"/> diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js index 0a6b3b27..c3f01374 100644 --- a/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js +++ b/js/components/whitelabel/wallet/components/lumenus/lumenus_piece_list.js @@ -32,11 +32,6 @@ let LumenusPieceList = React.createClass({ this.setState(state); }, - showOnlyConsignAcl(aclName) { - return aclName === 'acl_consign' || - aclName === 'acl_unconsign'; - }, - render() { setDocumentTitle(getLangText('Collection')); @@ -44,7 +39,6 @@ let LumenusPieceList = React.createClass({