From 4b341d795100a8a5417e4d822ae2afb3ed70da8a Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Tue, 12 Dec 2017 21:25:50 +0100
Subject: Prevent error in Referential validation/creation when some attributs
 are defined (organisation, name, etc)

---
 app/models/referential.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/models/referential.rb')

diff --git a/app/models/referential.rb b/app/models/referential.rb
index 29efaa609..851a33653 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
@@ -293,11 +294,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
-- 
cgit v1.2.3


From 43f8c76522288a0328d520dfc753ed173fc84964 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 19 Dec 2017 16:21:06 +0100
Subject: BusinessCalendar => PurchaseWindow belongs_to referential

---
 app/models/referential.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/models/referential.rb')

diff --git a/app/models/referential.rb b/app/models/referential.rb
index 851a33653..122af65a1 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -128,6 +128,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
-- 
cgit v1.2.3


From e20ce60629e91c63d75701651c117177ce02aced Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 28 Dec 2017 12:16:19 +0100
Subject: Add log messages when Referential can't be created. Remove useless
 build_referenial invocation in ReferentialsController#create. Refs #5297

---
 app/models/referential.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/models/referential.rb')

diff --git a/app/models/referential.rb b/app/models/referential.rb
index 122af65a1..8db009ebd 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -282,6 +282,7 @@ class Referential < ActiveRecord::Base
 
   def detect_overlapped_referentials
     self.class.where(id: overlapped_referential_ids).each do |referential|
+      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
-- 
cgit v1.2.3