Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-23 15:44:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source
This commit is contained in:
Reinier Balt 2013-09-05 12:24:47 +02:00
commit b0b39433d5
8 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/recurring_todo.rb
View file

@ -48,7 +48,6 @@ class RecurringTodo < ActiveRecord::Base
end
def validate_weekly
puts "@@@ validate_weekly [#{self.weekly_every_x_week}]"
if weekly_every_x_week.blank?
errors[:base] << "Every other nth week may not be empty for recurrence setting"
end

2
app/models/todo.rb
View file

@ -73,7 +73,7 @@ class Todo < ActiveRecord::Base
state :active
state :project_hidden
state :completed, :before_enter => Proc.new { |t| t.completed_at = Time.zone.now }, :before_exit => Proc.new { |t| t.completed_at = nil}
state :deferred, :after_exit => Proc.new { |t| t[:show_from] = nil }
state :deferred, :before_exit => Proc.new { |t| t[:show_from] = nil }
state :pending
event :defer do