From 0f16c936c211a6ab7324e0765f0ef4a8bcf28aa8 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 2 Oct 2017 12:41:27 +0200 Subject: add show link for compliance_control_block, wording links Refs #4659 --- app/decorators/compliance_control_decorator.rb | 13 +++++++++++-- app/views/compliance_control_sets/show.html.slim | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/decorators/compliance_control_decorator.rb b/app/decorators/compliance_control_decorator.rb index 3a05a5c59..e70ff5350 100644 --- a/app/decorators/compliance_control_decorator.rb +++ b/app/decorators/compliance_control_decorator.rb @@ -9,16 +9,25 @@ class ComplianceControlDecorator < Draper::Decorator content: h.destroy_link_content, href: h.compliance_control_set_compliance_control_path(object.compliance_control_set.id, object.id), method: :delete, - data: { confirm: h.t('compliance_controls.actions.destroy_confirm') } + data: { confirm: h.t('compliance_control_sets.actions.destroy_confirm') } ) # end # if h.policy(object).edit? links << Link.new( - content: h.t('compliance_controls.actions.edit'), + content: h.t('compliance_control_sets.actions.edit'), href: h.edit_compliance_control_set_compliance_control_path(object.compliance_control_set.id, object.id) ) # end + + + # if h.policy(object).show? + links << Link.new( + content: h.t('compliance_control_sets.actions.show'), + href: h.compliance_control_set_compliance_control_path(object.compliance_control_set.id, object.id) + ) + # end + links end diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index 3b0a123aa..0de6fb359 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -14,7 +14,7 @@ method: link.method, data: link.data, class: 'btn btn-primary' do - = link.content + = link.content / PageContent .page_content @@ -54,6 +54,7 @@ ), \ ], sortable: true, + #links: [:show], cls: 'table has-filter has-search' .select_toolbox -- cgit v1.2.3