Refs #6382 Refacto display of ccblock transport mode errors

3 files changed, 10 insertions, 8 deletions

diff --git a/app/assets/stylesheets/components/_compliance_control_blocks.sass b/app/assets/stylesheets/components/_compliance_control_blocks.sass
new file mode 100644
index 000000000..aa4e3948b
--- /dev/null
+++ b/app/assets/stylesheets/components/_compliance_control_blocks.sass
@@ -0,0 +1,4 @@
+#compliance_control_block_form
+	.condition_attributes_errors
+		margin-top: -20px
+		margin-bottom: 20px
\ No newline at end of file
diff --git a/app/controllers/compliance_control_blocks_controller.rb b/app/controllers/compliance_control_blocks_controller.rb
index 1173a548a..0851e2800 100644
--- a/app/controllers/compliance_control_blocks_controller.rb
+++ b/app/controllers/compliance_control_blocks_controller.rb
@@ -4,14 +4,6 @@ class ComplianceControlBlocksController < ChouetteController
   belongs_to :compliance_control_set
   actions :all, :except => [:show, :index]
 
-  after_action :display_errors, only: [:create, :update]
-
-  def display_errors
-    unless @compliance_control_block.errors[:condition_attributes].empty?
-      flash[:error] = @compliance_control_block.errors[:condition_attributes].join(', ')
-    end
-  end
-
   private
 
   def compliance_control_block_params
diff --git a/app/views/compliance_control_blocks/_form.html.slim b/app/views/compliance_control_blocks/_form.html.slim
index 2e87a877e..e8ae63384 100644
--- a/app/views/compliance_control_blocks/_form.html.slim
+++ b/app/views/compliance_control_blocks/_form.html.slim
@@ -1,6 +1,12 @@
 = simple_form_for [@compliance_control_set, @compliance_control_block], html: { class: 'form-horizontal', id: 'compliance_control_block_form' }, wrapper: :horizontal_form do |f|
   .row
     .col-lg-12
+      - if @compliance_control_block.errors.has_key? :condition_attributes
+        .row.condition-attributes-errors
+          .col-lg-12
+            .alert.alert-danger
+              - @compliance_control_block.errors[:condition_attributes].each do |msg|
+                p.small = "- #{msg}"
       .form-group
         = f.input :transport_mode, as: :select, collection: ComplianceControlBlock.sorted_transport_modes, label: t('activerecord.attributes.compliance_control_blocks.transport_mode'), label_method: lambda {|t| ("<span>" + t("enumerize.transport_mode.#{t}") + "</span>").html_safe }
         = f.input :transport_submode, as: :select, collection: ComplianceControlBlock.sorted_transport_submodes, label: t('activerecord.attributes.compliance_control_blocks.transport_submode'), label_method: lambda {|t| ("<span>" + t("enumerize.transport_submode.#{t}") + "</span>").html_safe }