From 3cc95cf7d595eb8f2a04ef5ea3359b3cd7173d28 Mon Sep 17 00:00:00 2001 From: diminator Date: Tue, 14 Jul 2015 00:56:23 +0200 Subject: [PATCH] acl WIP --- .../ascribe_buttons/acl_button_list.js | 1 + js/components/ascribe_buttons/delete_button.js | 17 ++++++++++++----- .../form_remove_editions_from_collection.js | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/js/components/ascribe_buttons/acl_button_list.js b/js/components/ascribe_buttons/acl_button_list.js index 1a694712..49abcc83 100644 --- a/js/components/ascribe_buttons/acl_button_list.js +++ b/js/components/ascribe_buttons/acl_button_list.js @@ -74,6 +74,7 @@ let AclButtonList = React.createClass({ currentUser={this.state.currentUser} handleSuccess={this.props.handleSuccess} /> {this.props.children} diff --git a/js/components/ascribe_buttons/delete_button.js b/js/components/ascribe_buttons/delete_button.js index 614401f0..3b3f0dd8 100644 --- a/js/components/ascribe_buttons/delete_button.js +++ b/js/components/ascribe_buttons/delete_button.js @@ -19,18 +19,25 @@ import EditionListActions from '../../actions/edition_list_actions'; let DeleteButton = React.createClass({ propTypes: { - editions: React.PropTypes.array.isRequired + editions: React.PropTypes.array.isRequired, + handleSuccess: React.PropTypes.func }, mixins: [Router.Navigation], showNotification(response) { - this.props.editions - .forEach((edition) => { - EditionListActions.fetchEditionList(edition.parent); - }); + if (this.props.editions.constructor === Array){ + this.props.editions + .forEach((edition) => { + EditionListActions.fetchEditionList(edition.parent); + }); + } + else { + EditionListActions.fetchEditionList(this.props.editions.id); + } EditionListActions.clearAllEditionSelections(); EditionListActions.closeAllEditionLists(); + this.props.handleSuccess(); this.transitionTo('pieces'); let notification = new GlobalNotificationModel(response.notification, 'success'); GlobalNotificationActions.appendGlobalNotification(notification); diff --git a/js/components/ascribe_forms/form_remove_editions_from_collection.js b/js/components/ascribe_forms/form_remove_editions_from_collection.js index fd3af834..e0cbcdf7 100644 --- a/js/components/ascribe_forms/form_remove_editions_from_collection.js +++ b/js/components/ascribe_forms/form_remove_editions_from_collection.js @@ -16,7 +16,7 @@ let EditionRemoveFromCollectionForm = React.createClass({ return requests.prepareUrl(apiUrls.edition_remove_from_collection, {edition_id: this.getBitcoinIds().join()}); } else { - return requests.prepareUrl(apiUrls.piece_remove_from_collection, {piece_id: this.editions.piece_id}); + return requests.prepareUrl(apiUrls.piece_remove_from_collection, {piece_id: this.props.editions.id}); } }, httpVerb(){