diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb index 5b9c6f19..dac10a9b 100644 --- a/app/models/ordergroup.rb +++ b/app/models/ordergroup.rb @@ -108,7 +108,7 @@ class Ordergroup < Group # Make sure, the name is uniq, add usefull message if uniq group is already deleted def uniqueness_of_name - id = new_record? ? '' : self.id + id = new_record? ? nil : self.id group = Ordergroup.with_deleted.where('groups.id != ? AND groups.name = ?', id, name).first if group.present? message = group.deleted? ? :taken_with_deleted : :taken @@ -118,7 +118,7 @@ class Ordergroup < Group # Make sure, the name is uniq, add usefull message if uniq group is already deleted def uniqueness_of_name - id = new_record? ? '' : self.id + id = new_record? ? nil : self.id group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first if group.present? message = group.deleted? ? :taken_with_deleted : :taken diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 557cd4e4..01f93d35 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -82,7 +82,7 @@ class Supplier < ActiveRecord::Base # Make sure, the name is uniq, add usefull message if uniq group is already deleted def uniqueness_of_name - id = new_record? ? '' : self.id + id = new_record? ? nil : self.id supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first if supplier.present? message = supplier.deleted? ? :taken_with_deleted : :taken