Merge pull request #166 from af83/5297_fix_referential_create_validation

Fix referential create redirect when invalid. Refs #5297 

3 files changed, 12 insertions, 6 deletions

diff --git a/app/assets/stylesheets/components/_referentials.sass b/app/assets/stylesheets/components/_referentials.sass
new file mode 100644
index 000000000..0bbb18f2b
--- /dev/null
+++ b/app/assets/stylesheets/components/_referentials.sass
@@ -0,0 +1,4 @@
+#referential_form
+	.metadatas-errors
+		margin-top: -20px
+		margin-bottom: 20px
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 40e8264ce..9dbd659da 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -13,14 +13,16 @@ class ReferentialsController < ChouetteController
   end
 
   def create
-    create! do |format|
+    create! do |success, failure|
       build_referenial
 
-      if !!@referential.created_from_id
-        flash[:notice] = t('notice.referentials.duplicate')
-
-        format.html { redirect_to workbench_path(@referential.workbench) }
+      success.html do
+        if @referential.created_from_id.present?
+          flash[:notice] = t('notice.referentials.duplicate')
+          redirect_to workbench_path(@referential.workbench)
+        end
       end
+      failure.html { render :new }
     end
   end
 
diff --git a/app/views/referentials/_form.html.slim b/app/views/referentials/_form.html.slim
index 6f7da84c7..1611ee6dd 100644
--- a/app/views/referentials/_form.html.slim
+++ b/app/views/referentials/_form.html.slim
@@ -17,7 +17,7 @@
     .row
       .col-lg-12
         - if @referential.errors.has_key? :metadatas
-          .row
+          .row.metadatas-errors
             .col-lg-12
               .alert.alert-danger
                 - @referential.errors[:metadatas].each do |msg|