diff options
| -rw-r--r-- | app/models/gtfs_import.rb | 2 | ||||
| -rw-r--r-- | app/models/import_task.rb | 4 | ||||
| -rw-r--r-- | app/views/import_tasks/_fields_gtfs_import.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/import_tasks.en.yml | 3 | ||||
| -rw-r--r-- | config/locales/import_tasks.fr.yml | 1 |
5 files changed, 8 insertions, 4 deletions
diff --git a/app/models/gtfs_import.rb b/app/models/gtfs_import.rb index 2cf0812bd..a0e5ee10b 100644 --- a/app/models/gtfs_import.rb +++ b/app/models/gtfs_import.rb @@ -1,6 +1,6 @@ class GtfsImport < ImportTask - enumerize :references_type, in: %w( all stoparea ) + enumerize :references_type, in: %w( stoparea ) attr_accessor :object_id_prefix, :max_distance_for_commercial, :ignore_last_word, :ignore_end_chars, :max_distance_for_connection_link, :references_type diff --git a/app/models/import_task.rb b/app/models/import_task.rb index 1a50a021b..795a964dc 100644 --- a/app/models/import_task.rb +++ b/app/models/import_task.rb @@ -95,6 +95,8 @@ class ImportTask def save_resources FileUtils.mkdir_p root + puts resources.inspect + puts saved_resources_path.inspect FileUtils.cp resources.path, saved_resources_path end @@ -111,7 +113,7 @@ class ImportTask end def saved_resources_path - "#{root}/#{Time.now.to_i}#{file_extname}" + @saved_resources_path ||= "#{root}/#{Time.now.to_i}#{file_extname}" end end diff --git a/app/views/import_tasks/_fields_gtfs_import.html.erb b/app/views/import_tasks/_fields_gtfs_import.html.erb index 1fef43584..6c75f36da 100644 --- a/app/views/import_tasks/_fields_gtfs_import.html.erb +++ b/app/views/import_tasks/_fields_gtfs_import.html.erb @@ -1,4 +1,4 @@ -<%= form.input :references_type, :as => :select, :include_blank => false, :input_html => { :title => t("formtastic.titles.import_task.references_type") } %> +<%= form.input :references_type, :as => :select, :include_blank => t("import_tasks.new.all"), :input_html => { :title => t("formtastic.titles.import_task.references_type") } %> <%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix } %> <%= form.input :max_distance_for_commercial , :as => :number , :input_html => { :title => t("formtastic.titles.import_task.max_distance_for_commercial"), :value => 0 } %> <%= form.input :ignore_last_word , :as => :boolean , :input_html => { :title => t("formtastic.titles.import_task.ignore_last_word"), :value => false }%> diff --git a/config/locales/import_tasks.en.yml b/config/locales/import_tasks.en.yml index 34f2508d8..34e99ae1b 100644 --- a/config/locales/import_tasks.en.yml +++ b/config/locales/import_tasks.en.yml @@ -4,7 +4,8 @@ en: new: "New import" new: title: "New import" - flash: "Import task on queue, refresh page to see progression" + all: "All" + flash: "Import task on queue, refresh page to see progression" activemodel: models: import_task: diff --git a/config/locales/import_tasks.fr.yml b/config/locales/import_tasks.fr.yml index 36adcb20e..422999a45 100644 --- a/config/locales/import_tasks.fr.yml +++ b/config/locales/import_tasks.fr.yml @@ -4,6 +4,7 @@ fr: new: "Nouvel import" new: title: "Nouvel import" + all: "Tout" flash: "La demande d'import est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression" activemodel: models: |