Merge branch 'master' into 0000-docker

1 files changed, 3 insertions, 3 deletions

diff --git a/app/models/referential_suite.rb b/app/models/referential_suite.rb
index 93c2c3f36..4f825628c 100644
--- a/app/models/referential_suite.rb
+++ b/app/models/referential_suite.rb
@@ -1,7 +1,7 @@
 class ReferentialSuite < ActiveRecord::Base
   belongs_to :new, class_name: 'Referential'
   validate def validate_consistent_new
-    return true if new_id.nil?
+    return true if new_id.nil? || new.nil?
     return true if new.referential_suite_id == id
     errors.add(:inconsistent_new,
                I18n.t('referential_suites.errors.inconsistent_new', name: new.name))
@@ -9,11 +9,11 @@ class ReferentialSuite < ActiveRecord::Base
 
   belongs_to :current, class_name: 'Referential'
   validate def validate_consistent_current
-    return true if current_id.nil?
+    return true if current_id.nil? || current.nil?
     return true if current.referential_suite_id == id
     errors.add(:inconsistent_current,
                I18n.t('referential_suites.errors.inconsistent_current', name: current.name))
   end
 
-  has_many :referentials
+  has_many :referentials, -> { order "created_at desc" }
 end