Refs #4256: Adding creator attr. on imports#index

4 files changed, 8 insertions, 6 deletions

diff --git a/app/views/imports/_filters.html.slim b/app/views/imports/_filters.html.slim
index 4ff0a1799..8df326010 100644
--- a/app/views/imports/_filters.html.slim
+++ b/app/views/imports/_filters.html.slim
@@ -1,7 +1,7 @@
 = search_form_for @q, url: workbench_imports_path(@workbench), html: { method: :get, class: 'form form-filter' } do |f|
   .ffg-row
     .input-group.search_bar
-      = f.search_field :name_cont, class: 'form-control', placeholder: "Indiquez un nom d'importation..."
+      = f.search_field :name_or_creator_cont, class: 'form-control', placeholder: "Indiquez un nom d'importation..."
       span.input-group-btn
         button.btn.btn-default#search_btn type='submit'
           span.fa.fa-search
diff --git a/app/views/imports/index.html.slim b/app/views/imports/index.html.slim
index 59991ebac..dfbefb66c 100644
--- a/app/views/imports/index.html.slim
+++ b/app/views/imports/index.html.slim
@@ -24,16 +24,16 @@
               ), \
               TableBuilderHelper::Column.new( \
                 key: :started_at, \
-                attribute: Proc.new { |imp| imp.started_at ? l(imp.started_at, format: :short) : '-' } \
+                attribute: 'started_at' \
               ), \
               TableBuilderHelper::Column.new( \
                 key: :name, \
                 attribute: 'name' \
               ), \
-              # TableBuilderHelper::Column.new( \
-              #   name: 'Opérateur', \
-              #   attribute: '' \
-              # ) \
+              TableBuilderHelper::Column.new( \
+                key: :creator, \
+                attribute: 'creator' \
+              ) \
             ],
             links: [],
             cls: 'table has-search'
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 58cad3839..beba9d437 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -56,6 +56,7 @@ en:
         started_at: Started at
         name: Name
         status: "Status"
+        creator: "Creator"
         references_type: "Data to be imported"
         no_save: "No save"
         rule_parameter_set_id: "Rule parameter set for compliance check"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 3a367c6e0..6c209f990 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -56,6 +56,7 @@ fr:
         started_at: Démarrage
         name: "Nom de l'import"
         status: "Etat"
+        creator: "Opérateur"
         no_save: "Pas de sauvegarde"
         references_type: "Données à importer"
         rule_parameter_set_id: "Jeu de paramètres pour validation"