diff options
| author | Robert | 2017-10-29 05:28:11 +0100 |
|---|---|---|
| committer | Robert | 2017-10-31 19:11:05 +0100 |
| commit | b1d432628e36d02a23324015f93d4b76a61433e7 (patch) | |
| tree | 5807ce4323c50c42f9551d9a3de22d951d1152e4 /app/views/compliance_control_sets | |
| parent | 148d05e5c7db7861c167a97d67a6b6da5ea5d9e7 (diff) | |
| download | chouette-core-b1d432628e36d02a23324015f93d4b76a61433e7.tar.bz2 | |
Refs: #4774@4h; Ransack debugged succesfully
Diffstat (limited to 'app/views/compliance_control_sets')
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 5 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/simple.html.slim | 34 |
2 files changed, 3 insertions, 36 deletions
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index d0cbb0ca4..db0ed64ea 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -35,7 +35,7 @@ = transport_mode("", "") - direct_controls = @compliance_controls.delete nil - - if direct_controls.any? + - if direct_controls.try(:any?) .row .col-lg-12 .select_table @@ -67,7 +67,7 @@ - @compliance_controls.each do |block, compliance_controls| - - if compliance_controls.any? + - if compliance_controls.try(:any?) .row .col-lg-12 h2 @@ -107,6 +107,7 @@ sortable: true, cls: 'table has-filter has-search', model: ComplianceControl + .select_toolbox ul li.st_action.with_text diff --git a/app/views/compliance_control_sets/simple.html.slim b/app/views/compliance_control_sets/simple.html.slim deleted file mode 100644 index 73f127646..000000000 --- a/app/views/compliance_control_sets/simple.html.slim +++ /dev/null @@ -1,34 +0,0 @@ -/ PageHeader -= pageheader 'Simple', - t('compliance_control_sets.show.title', name: @compliance_control_set.name), - 'Lorem ipsum dolor sit amet' - - -/ PageContent -.page_content - .container-fluid - .row - .col-lg-6.col-md-6.col-sm-12.col-xs-12 - = definition_list t('metadatas'), - ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name - - if params[:q].present? or @compliance_controls.any? - .row - .col-lg-12 - = render '/compliance_controls/simple_filters' - - - if @compliance_controls.any? - .row - .col-lg-12 - .select_table - table - thead - th id - th name - tbody - - @compliance_controls.each do | cc | - tr - td - = cc.id - td - = cc.name - |