diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/gtfs_import.rb | 2 | ||||
| -rw-r--r-- | app/models/import.rb | 3 | ||||
| -rw-r--r-- | app/models/import_task.rb | 2 | ||||
| -rw-r--r-- | app/models/neptune_import.rb | 2 | ||||
| -rw-r--r-- | app/models/netex_import.rb | 2 | ||||
| -rw-r--r-- | app/views/import_tasks/new.html.erb | 3 |
6 files changed, 7 insertions, 7 deletions
diff --git a/app/models/gtfs_import.rb b/app/models/gtfs_import.rb index 28bf074ad..2cf0812bd 100644 --- a/app/models/gtfs_import.rb +++ b/app/models/gtfs_import.rb @@ -14,7 +14,7 @@ class GtfsImport < ImportTask def action_params { "gtfs-import" => { - "no_save" => false, + "no_save" => no_save, "user_name" => user_name, "name" => name, "organisation_name" => organisation.name, diff --git a/app/models/import.rb b/app/models/import.rb index 54075ebcb..963756d0a 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -1,11 +1,10 @@ require 'open-uri' class Import - extend Enumerize extend ActiveModel::Naming extend ActiveModel::Translation include ActiveModel::Model - + attr_reader :datas def initialize( response ) diff --git a/app/models/import_task.rb b/app/models/import_task.rb index f548776b6..1a50a021b 100644 --- a/app/models/import_task.rb +++ b/app/models/import_task.rb @@ -12,7 +12,7 @@ class ImportTask cattr_accessor :root enumerize :data_format, in: %w( neptune netex gtfs ) - attr_accessor :rule_parameter_set_id, :referential_id, :user_id, :user_name, :data_format, :resources, :name + attr_accessor :rule_parameter_set_id, :referential_id, :user_id, :user_name, :data_format, :resources, :name, :no_save validates_presence_of :referential_id validates_presence_of :resources diff --git a/app/models/neptune_import.rb b/app/models/neptune_import.rb index e313e3988..1f0bdaa13 100644 --- a/app/models/neptune_import.rb +++ b/app/models/neptune_import.rb @@ -3,7 +3,7 @@ class NeptuneImport < ImportTask def action_params { "neptune-import" => { - "no_save" => false, + "no_save" => no_save, "user_name" => user_name, "name" => name, "organisation_name" => organisation.name, diff --git a/app/models/netex_import.rb b/app/models/netex_import.rb index 4668ad572..53cbb7903 100644 --- a/app/models/netex_import.rb +++ b/app/models/netex_import.rb @@ -3,7 +3,7 @@ class NetexImport < ImportTask def action_params { "netex-import" => { - "no_save" => false, + "no_save" => no_save, "user_name" => user_name, "name" => name, "organisation_name" => organisation.name, diff --git a/app/views/import_tasks/new.html.erb b/app/views/import_tasks/new.html.erb index b0155cd9f..3896da275 100644 --- a/app/views/import_tasks/new.html.erb +++ b/app/views/import_tasks/new.html.erb @@ -12,8 +12,9 @@ <%= form.inputs do %> <%= form.input :user_name, :as => :hidden, :input_html => { :value => current_user.name } %> <%= form.input :user_id, :as => :hidden, :input_html => { :value => current_user.id } %> <%= form.input :data_format, :as => :hidden %> - <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %> + <%= form.input :referential_id, :as => :hidden, :input_html => { :value => @referential.id } %> <%= form.input :name %> + <%= form.input :no_save, :as => :boolean %> <%= form.input :rule_parameter_set_id, :as => :select, :collection => @referential.organisation.rule_parameter_sets.map { |rps| [ rps.name, rps.id ] }, :include_blank => true %> <%= form.input :resources, :as => :file %> |