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

Merge branch 'master' into tests-rspec

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
wvengen 2013-07-24 20:45:38 +02:00
commit bb20e9abea
48 changed files with 1039 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/tasks/foodsoft.rake
View file

@ -8,7 +8,7 @@ namespace :foodsoft do
puts "Send notifications for #{task.name} to .."
for user in task.users
begin
Mailer.upcoming_tasks(user, task).deliver if user.settings['notify.upcoming_tasks'] == 1
Mailer.upcoming_tasks(user, task).deliver if user.settings.notify['upcoming_tasks'] == 1
rescue
puts "deliver aborted for #{user.email}.."
end
@ -23,7 +23,7 @@ namespace :foodsoft do
unless task.enough_users_assigned?
puts "Notify workgroup: #{workgroup.name} for task #{task.name}"
for user in workgroup.users
if user.settings['messages.sendAsEmail'] == "1" && !user.email.blank?
if user.settings.messages['send_as_email'] == "1" && !user.email.blank?
begin
Mailer.not_enough_users_assigned(task, user).deliver
rescue