diff options
| author | Robert | 2017-10-31 18:29:12 +0100 | 
|---|---|---|
| committer | Robert | 2017-10-31 19:11:05 +0100 | 
| commit | 3b0b05930e14992ffab6429e0319f07bc9c6e560 (patch) | |
| tree | 5e3577a7d8c69f8cbc93ede730d00404b3cd6b24 /app | |
| parent | 1b49238441368dc21e3776cda12475bde56b7854 (diff) | |
| download | chouette-core-3b0b05930e14992ffab6429e0319f07bc9c6e560.tar.bz2 | |
Refs: #4774@0.1h; CodeReview putting Business Logic of @indirect_compliance_controls into controller4774-compliance_control_sets-filters
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/compliance_control_sets_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 5 | 
2 files changed, 3 insertions, 3 deletions
| diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb index b8514e348..b45e85d49 100644 --- a/app/controllers/compliance_control_sets_controller.rb +++ b/app/controllers/compliance_control_sets_controller.rb @@ -22,6 +22,7 @@ class ComplianceControlSetsController < InheritedResources::Base          @compliance_controls    =            decorate_compliance_controls( @q_controls_form.result)              .group_by(&:compliance_control_block) +        @indirect_compliance_controls = @compliance_controls.delete nil        }      end    end diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index db0ed64ea..294df6a53 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -33,13 +33,12 @@        .col-lg-12          h2            = transport_mode("", "") -      - direct_controls = @compliance_controls.delete nil -      - if direct_controls.try(:any?) +      - if @indirect_compliance_controls.try(:any?)          .row            .col-lg-12              .select_table -              = table_builder_2 direct_controls, +              = table_builder_2 @indirect_compliance_controls,                        [ \                    TableBuilderHelper::Column.new( \                      key: :code, \ | 
