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

2 files changed, 66 insertions, 62 deletions

diff --git a/app/controllers/concerns/ransack_date_filter.rb b/app/controllers/concerns/ransack_date_filter.rb
index 225fd91ee..9c2755186 100644
--- a/app/controllers/concerns/ransack_date_filter.rb
+++ b/app/controllers/concerns/ransack_date_filter.rb
@@ -2,40 +2,41 @@ module RansackDateFilter
   extend ActiveSupport::Concern
   cattr_accessor :date_param
 
-    included do
-
-      def set_date_time_params(param_name, klass)
-        start_date = []
-        end_date = []
-
-        if params[:q] && params[:q][param_name] && !params[:q][param_name].has_value?(nil) && !params[:q][param_name].has_value?("")
-          [1, 2, 3].each do |key|
-            start_date <<  params[:q][param_name]["start_date(#{key}i)"].to_i
-            end_date <<  params[:q][param_name]["end_date(#{key}i)"].to_i
-          end
-          params[:q].delete([param_name])
-
-          if klass == DateTime
-            @begin_range = klass.new(*start_date,0,0,0) rescue nil
-            @end_range = klass.new(*end_date,23,59,59) rescue nil
-          else
-            @begin_range = klass.new(*start_date) rescue nil
-            @end_range = klass.new(*end_date) rescue nil
+  included do
+
+    def set_date_time_params(param_name, klass)
+      start_date = []
+      end_date = []
+
+      if params[:q] && params[:q][param_name] && !params[:q][param_name].has_value?(nil) && !params[:q][param_name].has_value?("")
+        [1, 2, 3].each do |key|
+          start_date <<  params[:q][param_name]["start_date(#{key}i)"].to_i
+          end_date <<  params[:q][param_name]["end_date(#{key}i)"].to_i
         end
-      end
 
-      # Fake ransack filter
-      def ransack_period_range **options
-        return options[:scope] unless !!@begin_range && !!@end_range
+        params[:q].delete([param_name])
 
-        if @begin_range > @end_range
-          flash.now[:error] = options[:error_message]
+        if klass == DateTime
+          @begin_range = klass.new(*start_date,0,0,0) rescue nil
+          @end_range = klass.new(*end_date,23,59,59) rescue nil
         else
-          scope = options[:scope].send options[:query], @begin_range..@end_range
+          @begin_range = klass.new(*start_date) rescue nil
+          @end_range = klass.new(*end_date) rescue nil
         end
-        scope
       end
     end
 
+    # Fake ransack filter
+    def ransack_period_range **options
+      return options[:scope] unless !!@begin_range && !!@end_range
+
+      if @begin_range > @end_range
+        flash.now[:error] = options[:error_message]
+      else
+        scope = options[:scope].send options[:query], @begin_range..@end_range
+      end
+      scope
+    end
   end
+
 end
\ No newline at end of file
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index e66291150..54f95bb34 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -23,47 +23,50 @@
       .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
-
-  .container-fluid
-    .row
-      .col-lg-12
-          /= render 'filters'
     .row
       .col-lg-12
         h2
           = transport_mode("", "")
-      .col-lg-12
-        .select_table
-          = table_builder_2 @compliance_controls_without_block,
-                  [ \
-              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'
+      .row
+        .col-lg-12
+          .select_table
+            = table_builder_2 @compliance_controls_without_block,
+                    [ \
+                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'
 
     - @compliance_control_set.compliance_control_blocks.each do |block|
-        .row
-          .col-lg-12
-            h2
-              = transport_mode(block.transport_mode, block.transport_submode)
+      .row
+        .col-lg-12
+          h2
+            = transport_mode(block.transport_mode, block.transport_submode)
+            .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