Fix gtfs export Refs #0035513 #0035521

2 files changed, 6 insertions, 4 deletions

diff --git a/app/models/export_task.rb b/app/models/export_task.rb
index 0cd75b08b..fe85e335a 100644
--- a/app/models/export_task.rb
+++ b/app/models/export_task.rb
@@ -23,7 +23,9 @@ class ExportTask
   validates_presence_of :references_type
   
   def initialize( params = {} )
-    params.each {|k,v| send("#{k}=",v)}
+    run_callbacks :initialize do
+      params.each {|k,v| send("#{k}=",v)}
+    end
   end
 
   def referential
diff --git a/app/models/gtfs_export.rb b/app/models/gtfs_export.rb
index 86bf3c368..0fa6e377d 100644
--- a/app/models/gtfs_export.rb
+++ b/app/models/gtfs_export.rb
@@ -1,7 +1,7 @@
 class GtfsExport < ExportTask
 
   validates_presence_of :time_zone
-  attr_accessor :time_zone, :object_id_prefix
+  attr_accessor :object_id_prefix, :time_zone
 
   enumerize :references_type, in: %w( network line company group_of_line stop_area )
   
@@ -13,7 +13,7 @@ class GtfsExport < ExportTask
     end
   end
 
-  def time_zone=(time_zone)
+  def real_time_zone
     ActiveSupport::TimeZone.find_tzinfo(time_zone).name
   end
 
@@ -26,7 +26,7 @@ class GtfsExport < ExportTask
         "user_name" => user_name,
         "organisation_name" => organisation.name,
         "referential_name" => referential.name,
-        "time_zone" => time_zone,
+        "time_zone" => real_time_zone,
         "object_id_prefix" => object_id_prefix
       }
     }