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

user display changes in model and mailer

Browse source
This commit is contained in:
wvengen 2013-09-22 14:38:56 +02:00
parent f6c2fd9a9d
commit ea3db22306
4 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/ordergroup.rb
View file

@ -23,7 +23,7 @@ class Ordergroup < Group
"#{contact_phone} (#{contact_person})"
end
def non_members
User.all(:order => 'nick').reject { |u| (users.include?(u) || u.ordergroup) }
User.natural_order.all.reject { |u| (users.include?(u) || u.ordergroup) }
end
def value_of_open_orders(exclude = nil)
@ -102,7 +102,7 @@ class Ordergroup < Group
# Make sure, that a user can only be in one ordergroup
def uniqueness_of_members
users.each do |user|
errors.add :user_tokens, I18n.t('ordergroups.model.error_single_group', :user => user.nick) if user.groups.where(:type => 'Ordergroup').size > 1
errors.add :user_tokens, I18n.t('ordergroups.model.error_single_group', :user => user.display) if user.groups.where(:type => 'Ordergroup').size > 1
end
end