Merge branch 'master' into 5024-prevent-duplicate-referentials-from-being-created-during-parallel-db-transactions--rb201711271659

1 files changed, 10 insertions, 4 deletions

diff --git a/app/models/referential.rb b/app/models/referential.rb
index 3a9ef2027..1cdda9e6a 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 class Referential < ActiveRecord::Base
   include DataFormatEnumerations
   include ObjectidFormatterSupport
@@ -34,7 +35,7 @@ class Referential < ActiveRecord::Base
                I18n.t('referentials.errors.inconsistent_organisation',
                       indirect_name: workbench.organisation.name,
                       direct_name: organisation.name))
-  end
+  end, if: :organisation
 
   belongs_to :line_referential
   validates_presence_of :line_referential
@@ -139,6 +140,10 @@ class Referential < ActiveRecord::Base
     Chouette::RoutingConstraintZone.all
   end
 
+  def purchase_windows
+    Chouette::PurchaseWindow.all
+  end
+
   before_validation :define_default_attributes
 
   def define_default_attributes
@@ -295,7 +300,8 @@ class Referential < ActiveRecord::Base
 
   def detect_overlapped_referentials
     self.class.where(id: overlapped_referential_ids).each do |referential|
-      errors.add :metadatas, I18n.t("referentials.errors.overlapped_referential", referential: referential.name)
+      Rails.logger.info "Referential #{referential.id} #{referential.metadatas.inspect} overlaps #{metadatas.inspect}"
+      errors.add :metadatas, I18n.t("referentials.errors.overlapped_referential", :referential => referential.name)
     end
   end
 
@@ -315,11 +321,11 @@ class Referential < ActiveRecord::Base
   end
 
   def assign_slug
-    self.slug ||= "#{self.name.parameterize.gsub('-', '_')}_#{Time.now.to_i}"
+    self.slug ||= "#{name.parameterize.gsub('-', '_')}_#{Time.now.to_i}" if name
   end
 
   def assign_prefix
-    self.prefix = organisation.name.parameterize.gsub('-', '_')
+    self.prefix = organisation.name.parameterize.gsub('-', '_') if organisation
   end
 
   def assign_line_and_stop_area_referential