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

2 files changed, 7 insertions, 7 deletions

diff --git a/app/helpers/compliance_control_blocks_helper.rb b/app/helpers/compliance_control_blocks_helper.rb
index 09e22d6e9..5c279b33a 100644
--- a/app/helpers/compliance_control_blocks_helper.rb
+++ b/app/helpers/compliance_control_blocks_helper.rb
@@ -1,10 +1,10 @@
 module ComplianceControlBlocksHelper
   def transport_mode(transport_mode, transport_submode)
-    if (transport_mode) && (transport_submode) != ""
-      transportMode = "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]"
+    return "[Tous les modes de transport]" if transport_mode == ""
+    if transport_submode == ""
+       "[" + t("enumerize.transport_mode.#{transport_mode}") + "]"
     else
-      transportMode = "[Tous les modes de transport]"
+      "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]"
     end
-    transportMode
   end
 end
\ No newline at end of file
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 300fad9e2..de51efded 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -35,7 +35,7 @@ class WorkbenchImportWorker
   end
 
   def handle_corrupt_zip_file
-    @workbench_import.messages.create(criticity: :error, message_key: 'corrupt_zip_file', message_attributes: {import_name: @workbench_import.name})
+    @workbench_import.messages.create(criticity: :error, message_key: 'corrupt_zip_file', message_attributes: {source_filename: @workbench_import.file.file.file})
   end
 
   def upload zip_service
@@ -55,8 +55,8 @@ class WorkbenchImportWorker
         criticity: :warning,
         message_key: 'inconsistent_zip_file',
         message_attributes: {
-          'import_name' => @workbench_import.name,
-          'spurious_dirs' => entry.spurious.join(', ')
+          'source_filename' => @workbench_import.file.file.file,
+          'spurious_dirs'   => entry.spurious.join(', ')
         }) 
     end
   end