diff options
| -rw-r--r-- | app/assets/javascripts/export_tasks/new.js.coffee (renamed from app/assets/javascripts/export_tasks.js.coffee) | 8 | ||||
| -rw-r--r-- | app/models/export.rb | 4 | ||||
| -rw-r--r-- | app/models/gtfs_export.rb | 2 | ||||
| -rw-r--r-- | app/models/hub_export.rb | 2 | ||||
| -rw-r--r-- | app/models/kml_export.rb | 2 | ||||
| -rw-r--r-- | app/models/neptune_export.rb | 2 | ||||
| -rw-r--r-- | app/models/netex_export.rb | 2 |
7 files changed, 10 insertions, 12 deletions
diff --git a/app/assets/javascripts/export_tasks.js.coffee b/app/assets/javascripts/export_tasks/new.js.coffee index cf0b61977..466486df6 100644 --- a/app/assets/javascripts/export_tasks.js.coffee +++ b/app/assets/javascripts/export_tasks/new.js.coffee @@ -1,4 +1,4 @@ -jQuery -> +$(".export_tasks.new").ready -> export_references_type_change = (event) -> references_type = $(event.target).val() @@ -7,10 +7,8 @@ jQuery -> # Hide li block li.toggle(enabled) # Disable textarea to ignore it in POST data - console.log(enabled) - li.find(".token-input").first().attr("disabled", !enabled) - console.log(li.find(".token-input")) - + li.find(".token-input").attr("disabled", !enabled) + toggle_input($(li)) for li in $(event.target).parents('form').find("li.reference_ids") $('form select[name="export_task[references_type]"]').change( export_references_type_change ) diff --git a/app/models/export.rb b/app/models/export.rb index f1f62e86f..22475af0b 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -24,7 +24,7 @@ class Export response = Ievkit.get(report_path) ExportReport.new(response) else - raise Ievkit::Error("Impossible to access report path link for export") + nil end end @@ -37,7 +37,7 @@ class Export elsif cancel_path Ievkit.delete(cancel_path) else - raise Ievkit::Error("Impossible to access delete or cancel path link for import") + nil end end diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb index 2b33d52f9..86bf3c368 100644 --- a/app/models/gtfs_export.rb +++ b/app/models/gtfs_export.rb @@ -3,7 +3,7 @@ class GtfsExport < ExportTask validates_presence_of :time_zone attr_accessor :time_zone, :object_id_prefix - enumerize :references_type, in: %w( network line company groupofline stoparea ) + enumerize :references_type, in: %w( network line company group_of_line stop_area ) after_initialize :init_params diff --git a/app/models/hub_export.rb b/app/models/hub_export.rb index cb0092113..c0709cc1d 100644 --- a/app/models/hub_export.rb +++ b/app/models/hub_export.rb @@ -1,7 +1,7 @@ class HubExport < ExportTask attr_accessor :start_date, :end_date - enumerize :references_type, in: %w( network line company groupofline ) + enumerize :references_type, in: %w( network line company group_of_line ) validates :start_date, presence: true , if: "end_date.present?" validates :end_date, presence: true, if: "start_date.present?" diff --git a/app/models/kml_export.rb b/app/models/kml_export.rb index 9d87f7cdf..16a565eed 100644 --- a/app/models/kml_export.rb +++ b/app/models/kml_export.rb @@ -1,6 +1,6 @@ class KmlExport < ExportTask - enumerize :references_type, in: %w( network line company groupofline ) + enumerize :references_type, in: %w( network line company group_of_line ) def action_params { diff --git a/app/models/neptune_export.rb b/app/models/neptune_export.rb index b7f2164ac..45c2aa4ea 100644 --- a/app/models/neptune_export.rb +++ b/app/models/neptune_export.rb @@ -1,7 +1,7 @@ class NeptuneExport < ExportTask attr_accessor :start_date, :end_date, :extensions, :export_type - enumerize :references_type, in: %w( network line company groupofline ) + enumerize :references_type, in: %w( network line company group_of_line ) validates :start_date, presence: true , if: "end_date.present?" validates :end_date, presence: true, if: "start_date.present?" diff --git a/app/models/netex_export.rb b/app/models/netex_export.rb index bac9d1d87..cb48434a7 100644 --- a/app/models/netex_export.rb +++ b/app/models/netex_export.rb @@ -1,6 +1,6 @@ class NetexExport < ExportTask - enumerize :references_type, in: %w( network line company groupofline ) + enumerize :references_type, in: %w( network line company group_of_line ) def action_params { |
