Merge branch 'master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659

1 files changed, 11 insertions, 6 deletions

diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 227651a59..83e3bc56a 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -13,11 +13,16 @@ class ReferentialsController < ChouetteController
   end
 
   def create
-    create! do |format|
-      build_referential
-
-      if !!@referential.created_from_id
-        format.html { redirect_to workbench_path(@referential.workbench) }
+    create! do |success, failure|
+      success.html do
+        if @referential.created_from_id.present?
+          flash[:notice] = t('notice.referentials.duplicate')
+        end
+        redirect_to workbench_path(@referential.workbench)
+      end
+      failure.html do
+        Rails.logger.info "Can't create Referential : #{@referential.errors.inspect}"
+        render :new
       end
     end
   end
@@ -60,7 +65,7 @@ class ReferentialsController < ChouetteController
 
   def validate
     ComplianceControlSetCopyWorker.perform_async(params[:compliance_control_set], params[:id])
-    flash[:notice] = I18n.t("referentials.operation_in_progress")
+    flash[:notice] = t('notice.referentials.validate')
     redirect_to(referential_path)
   end