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

Make activated todo in hidden project stay hidden

Browse source 
Fixes #1417
This commit is contained in:
Dan Rice 2014-09-08 22:50:07 -04:00
parent 1d97d3cd46
commit a450e09681
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/todo.rb
View file

@ -76,9 +76,10 @@ class Todo < ActiveRecord::Base
aasm.event :activate do
transitions :to => :active, :from => [:project_hidden, :deferred]
transitions :to => :active, :from => [:completed], :guard => :no_uncompleted_predecessors?
transitions :to => :active, :from => [:pending], :guard => :no_uncompleted_predecessors_or_deferral?
transitions :to => :active, :from => [:pending], :guard => :guard_for_transition_from_pending_to_active
transitions :to => :pending, :from => [:completed], :guard => :uncompleted_predecessors?
transitions :to => :deferred, :from => [:pending], :guard => :guard_for_transition_from_pending_to_deferred
transitions :to => :project_hidden, :from => [:pending], :guard => :guard_for_transition_from_pending_to_project_hidden
end
aasm.event :hide do
@ -142,10 +143,18 @@ class Todo < ActiveRecord::Base
return !uncompleted_predecessors.all.empty?
end
def guard_for_transition_from_pending_to_active
no_uncompleted_predecessors_or_deferral? && not_part_of_hidden_container?
end
def guard_for_transition_from_pending_to_deferred
no_uncompleted_predecessors? && not_part_of_hidden_container?
end
def guard_for_transition_from_pending_to_project_hidden
no_uncompleted_predecessors? && part_of_hidden_container?
end
def part_of_hidden_container?
(self.project && self.project.hidden?) || self.context.hidden?
end