From f225ee42329c7579695eb4e1879c6429209e3e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Mon, 13 Jul 2015 19:46:06 +0200 Subject: [PATCH] adjust table acl filtered --- .../accordion_list_item_table_editions.js | 3 +-- js/components/ascribe_table/table_item_acl_filtered.js | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js index 0ebdb2ab..e2c7d263 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_table_editions.js @@ -162,8 +162,7 @@ let AccordionListItemTableEditions = React.createClass({ new ColumnModel( (item) => { let content = item.acl; - if (item.request_action){ - // TODO should request be translated? + if (item.request_action) { content = [item.request_action + ' request']; } return { diff --git a/js/components/ascribe_table/table_item_acl_filtered.js b/js/components/ascribe_table/table_item_acl_filtered.js index 562f1268..46ac4d08 100644 --- a/js/components/ascribe_table/table_item_acl_filtered.js +++ b/js/components/ascribe_table/table_item_acl_filtered.js @@ -9,12 +9,14 @@ let TableItemAclFiltered = React.createClass({ }, render() { - var availableAcls = ['consign', 'loan', 'transfer', 'view', 'consign request', 'unconsign request', 'loan request']; + var availableAcls = ['acl_consign', 'acl_loan', 'acl_transfer', 'acl_view', 'acl_share', 'acl_unshare']; - let filteredAcls = this.props.content.filter((v) => { - return availableAcls.indexOf(v) > -1; + let filteredAcls = Object.keys(this.props.content).filter((key) => { + return availableAcls.indexOf(key) > -1 && this.props.content[key]; }); + filteredAcls = filteredAcls.map((acl) => acl.split('acl_')[1]); + return ( {filteredAcls.join('/')}