Merge branch 'master' of github.com:af83/stif-boiv

1 files changed, 17 insertions, 74 deletions

diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index e6416fda4..4385505b0 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -26,82 +26,25 @@
       .col-lg-12
         = render '/compliance_controls/filters'
 
+  / compliance controls without block
+  - if @direct_compliance_controls.try(:any?)
+    = render_compliance_control_block
+    = render_compliance_controls(@direct_compliance_controls)
 
-    - if @direct_compliance_controls.try(:any?)
-      .row
-        .col-lg-12
-          h2
-            = transport_mode_text()
-      .row
-        .col-lg-12
-          .select_table
-            = table_builder_2 @direct_compliance_controls,
-                    [ \
-                TableBuilderHelper::Column.new( \
-                  key: :code, \
-                  attribute: 'code' \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :name, \
-                  attribute: 'name', \
-                  link_to: lambda do |compliance_control| \
-                      compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \
-                    end \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :criticity, \
-                  attribute: 'criticity' \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :comment, \
-                  attribute: 'comment' \
-                ), \
-              ],
-              sortable: true,
-              cls: 'table has-filter has-search',
-              model: ComplianceControl
-
+  / compliance controls with block
+  - if params[:q] && params[:q][:compliance_control_block_id_eq_any].try(:present?)
     - @blocks_to_compliance_controls_map.each do |block, compliance_controls|
+      = render_compliance_control_block(block)
+      = render_compliance_controls(compliance_controls)
+  - else
+    - @compliance_control_set.compliance_control_blocks.each do |block|
+      = render_compliance_control_block(block)
+      = render_compliance_controls(@blocks_to_compliance_controls_map[block])
 
-      - if compliance_controls.try(:any?)
-        .row
-          .col-lg-12
-            h2
-              = transport_mode_text(block)
-              .btn-group
-                .btn.dropdown-toggle{ data-toggle="dropdown" }
-                  .span.fa.fa-cog
-                ul.dropdown-menu
-                  li
-                    = link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id)
-                    = link_to t('compliance_control_sets.actions.destroy'), compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id), :method => :delete, :data => {:confirm =>  t('compliance_control_sets.actions.destroy_confirm')}
-        .row
-          .col-lg-12
-            .select_table
-              = table_builder_2 compliance_controls,
-                      [ \
-                  TableBuilderHelper::Column.new( \
-                    key: :code, \
-                    attribute: 'code' \
-                  ), \
-                  TableBuilderHelper::Column.new( \
-                    key: :name, \
-                    attribute: 'name', \
-                    link_to: lambda do |compliance_control| \
-                        compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \
-                      end \
-                  ), \
-                  TableBuilderHelper::Column.new( \
-                    key: :criticity, \
-                    attribute: 'criticity' \
-                  ), \
-                  TableBuilderHelper::Column.new( \
-                    key: :comment, \
-                    attribute: 'comment' \
-                  ), \
-                ],
-                sortable: true,
-                cls: 'table has-filter has-search',
-                model: ComplianceControl
+  - if params[:q].present? && !@blocks_to_compliance_controls_map.try(:any?) && @direct_compliance_controls.nil?
+    .row.mt-xs
+      .col-lg-12
+        = replacement_msg t('compliance_controls.search_no_results')
 
+  / flotted buttons
   = flotted_links @compliance_control_set.id