Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

do not use string values for integers (closes foodcoops/foodsoft#128)

Browse source
This commit is contained in:
wvengen 2013-06-14 01:33:56 +02:00
parent ca9841dd02
commit 13f2c128c6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/ordergroup.rb
View file

@ -108,7 +108,7 @@ class Ordergroup < Group
# Make sure, the name is uniq, add usefull message if uniq group is already deleted # Make sure, the name is uniq, add usefull message if uniq group is already deleted
def uniqueness_of_name 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 group = Ordergroup.with_deleted.where('groups.id != ? AND groups.name = ?', id, name).first
if group.present? if group.present?
message = group.deleted? ? :taken_with_deleted : :taken 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 # Make sure, the name is uniq, add usefull message if uniq group is already deleted
def uniqueness_of_name 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 group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first
if group.present? if group.present?
message = group.deleted? ? :taken_with_deleted : :taken message = group.deleted? ? :taken_with_deleted : :taken

2
app/models/supplier.rb
View file

@ -82,7 +82,7 @@ class Supplier < ActiveRecord::Base
# Make sure, the name is uniq, add usefull message if uniq group is already deleted # Make sure, the name is uniq, add usefull message if uniq group is already deleted
def uniqueness_of_name 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 supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
if supplier.present? if supplier.present?
message = supplier.deleted? ? :taken_with_deleted : :taken message = supplier.deleted? ? :taken_with_deleted : :taken