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')

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