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

get tests running and fix editing context state

Browse source
This commit is contained in:
Reinier Balt 2013-02-27 23:31:02 +01:00
parent 99eed9f638
commit 1e84adc91b
8 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/context.rb
View file

@ -6,7 +6,7 @@ class Context < ActiveRecord::Base
belongs_to :user
scope :active, :conditions => { :state => :active }
scope :hidden, :conditions => { :state => :hide }
scope :hidden, :conditions => { :state => :hidden }
acts_as_list :scope => :user, :top_of_list => 0

8
app/models/todo.rb
View file

@ -34,12 +34,12 @@ class Todo < ActiveRecord::Base
scope :not_deferred_or_blocked, :conditions => ["(NOT todos.state=?) AND (NOT todos.state = ?)", "deferred", "pending"]
scope :hidden,
:joins => "INNER JOIN contexts c_hidden ON c_hidden.id = todos.context_id",
:conditions => ["todos.state = ? OR (c_hidden.hide = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?))",
'project_hidden', true, 'active', 'deferred', 'pending']
:conditions => ["todos.state = ? OR (c_hidden.state = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?))",
'project_hidden', 'hidden', 'active', 'deferred', 'pending']
scope :not_hidden,
:joins => "INNER JOIN contexts c_hidden ON c_hidden.id = todos.context_id",
:conditions => ['NOT(todos.state = ? OR (c_hidden.hide = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?)))',
'project_hidden', true, 'active', 'deferred', 'pending']
:conditions => ['NOT(todos.state = ? OR (c_hidden.state = ? AND (todos.state = ? OR todos.state = ? OR todos.state = ?)))',
'project_hidden', 'hidden', 'active', 'deferred', 'pending']
# other scopes
scope :are_due, :conditions => ['NOT (todos.due IS NULL)']