Merge branch 'master' into rails3
Conflicts: .gitignore app/models/task.rb app/models/workgroup.rb app/views/shared/_group_form.html.haml config/locales/de.yml db/schema.rb
This commit is contained in:
commit
182742fbec
10 changed files with 46 additions and 26 deletions
|
|
@ -25,7 +25,7 @@ namespace :foodsoft do
|
|||
workgroups = Workgroup.all :conditions => {:weekly_task => true}
|
||||
for workgroup in workgroups
|
||||
puts "Create weekly tasks for #{workgroup.name}"
|
||||
workgroup.next_weekly_tasks(8)[3..5].each do |date|
|
||||
workgroup.next_weekly_tasks[3..5].each do |date|
|
||||
unless workgroup.tasks.exists?({:due_date => date, :weekly => true})
|
||||
workgroup.tasks.create(workgroup.task_attributes(date))
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue