fix format name on export import formular. Refs #135

4 files changed, 18 insertions, 2 deletions

diff --git a/app/models/export.rb b/app/models/export.rb
index 58d3466b5..d8c7820be 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -136,6 +136,14 @@ class Export < ActiveRecord::Base
     read_attribute :reference_ids
   end
 
+  def self.format_name(format)
+    name_by_format = { "NeptuneExport" => "Neptune",
+                       "CsvExport" => "CSV",
+                       "GtfsExport" => "GTFS",
+                       "NetexExport" => "NeTEx"}
+    name_by_format[format]
+  end
+
   def self.types
     unless Rails.env.development?
       subclasses.map(&:to_s)
diff --git a/app/models/import.rb b/app/models/import.rb
index 4ea931e92..bd795d6ce 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -25,6 +25,14 @@ class Import < ActiveRecord::Base
     end
   end
 
+  def self.format_name(format)
+    name_by_format = { "NeptuneImport" => "Neptune",
+                       "CsvImport" => "CSV",
+                       "GtfsImport" => "GTFS",
+                       "NetexImport" => "NeTEx"}
+    name_by_format[format]
+  end
+
   def self.types
     # if Rails.env.development? and subclasses.blank?
     #   Dir[File.expand_path("../*_import.rb", __FILE__)].each do |f| 
diff --git a/app/views/exports/new.html.erb b/app/views/exports/new.html.erb
index 4e7276656..e0e37fb34 100644
--- a/app/views/exports/new.html.erb
+++ b/app/views/exports/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([@referential, @export], :as => :export, :url => new_referential_export_path(@referential), :method => :get) do |form| %>
   <%= form.inputs do %>
-     <%= form.input :type, :as => :select, :collection => Export.types, :required => true, :include_blank => false %>
+    <%= form.input :type, :as => :select, :collection => Export.types.map { |format| [ Export.format_name(format), format]}, :required => true, :include_blank => false %>
   <% end %>
 <% end %>
 
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 08995aa87..23fb3b0cd 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([@referential, @import], :as => :import, :url => new_referential_import_path(@referential), :method => :get) do |form| %>  
   <%= form.inputs do %>
-    <%= form.input :type, :as => :select, :collection => Import.types, :required => true, :include_blank => false %>
+    <%= form.input :type, :as => :select, :collection => Import.types.map { |format| [ Import.format_name(format), format]}, :required => true, :include_blank => false %>
   <% end %>
 <% end %>