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

Merge pull request #315 from wvengen/feature/db_seeds

Browse source 
more extensive database seeds (in two languages)
This commit is contained in:
wvengen 2014-10-16 20:43:11 +02:00
commit c585f53f54
7 changed files with 444 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/article.rb
View file

@ -224,7 +224,8 @@ class Article < ActiveRecord::Base
def uniqueness_of_name
matches = Article.where(name: name, supplier_id: supplier_id, deleted_at: deleted_at, type: type)
matches = matches.where.not(id: id) unless new_record?
if supplier.shared_sync_method.blank? or supplier.shared_sync_method == 'import'
# supplier should always be there - except, perhaps, on initialization (on seeding)
if supplier and (supplier.shared_sync_method.blank? or supplier.shared_sync_method == 'import')
errors.add :name, :taken if matches.any?
else
errors.add :name, :taken_with_unit if matches.where(unit: unit, unit_quantity: unit_quantity).any?