prepare version 2.5.1

3 files changed, 17 insertions, 3 deletions

diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb
index 6f43a93eb..6ee83098f 100644
--- a/app/models/gtfs_export.rb
+++ b/app/models/gtfs_export.rb
@@ -2,21 +2,27 @@ class GtfsExport < Export
 
   validates_presence_of :time_zone
   option :time_zone
+  option :object_id_prefix
   
-  after_initialize :init_time_zone
+  after_initialize :init_params
   
   def references_types
     [ Chouette::Line, Chouette::Network, Chouette::Company, Chouette::StopArea ]
   end
 
-  def init_time_zone
+  def init_params
     if time_zone.nil?
       self.time_zone = "Paris"
     end
   end
   
   def export_options
-    super.merge(:format => :gtfs, :time_zone => ActiveSupport::TimeZone.find_tzinfo(time_zone).name)
+    opts = super.merge(:format => :gtfs, :time_zone => ActiveSupport::TimeZone.find_tzinfo(time_zone).name)
+    if object_id_prefix.present?
+      opts = opts.merge(:object_id_prefix => object_id_prefix)
+    end
+    puts opts.inspect
+    opts
   end
 
 end
diff --git a/app/views/exports/_fields_gtfs_export.erb b/app/views/exports/_fields_gtfs_export.erb
index 60ffd21c8..3ec95c181 100644
--- a/app/views/exports/_fields_gtfs_export.erb
+++ b/app/views/exports/_fields_gtfs_export.erb
@@ -1 +1,2 @@
 <%= form.input :time_zone, :as => :time_zone, :input_html => { :title => t("formtastic.titles.export.time_zone")} %>
+<%= form.input :object_id_prefix, :input_html => { :value => @referential.prefix ,:title => t("formtastic.titles.export.object_id_prefix")} %>
\ No newline at end of file
diff --git a/app/views/help/terms.textile b/app/views/help/terms.textile
new file mode 100644
index 000000000..aa6c345d3
--- /dev/null
+++ b/app/views/help/terms.textile
@@ -0,0 +1,7 @@
+---

+layout: default

+title: Glossaire

+---

+

+p. à renseigner

+