diff options
| author | Luc Donnet | 2015-05-11 16:14:13 +0200 | 
|---|---|---|
| committer | Luc Donnet | 2015-05-11 16:14:13 +0200 | 
| commit | eb9fc261f0becd37e7c970770c29fb39e05bad7d (patch) | |
| tree | 6651e614a11174b0fe91863052b0199e37c2c1b4 /app | |
| parent | aed720a30e4d1375de566ed3c093cf0664614f9c (diff) | |
| download | chouette-core-eb9fc261f0becd37e7c970770c29fb39e05bad7d.tar.bz2 | |
Fix import task for gtfs Refs #0035519
Diffstat (limited to 'app')
| -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 | 
3 files changed, 5 insertions, 3 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 }%> | 
