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

Committed Reinier Balt's patch to hide contexts on the mobile view's home page that are marked hidden in Tracks.

Browse source 
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@602 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lukemelia 2007-09-27 03:08:50 +00:00
parent 8206242c33
commit 7672112dd5
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tracks/app/controllers/todos_controller.rb
View file

@ -13,8 +13,8 @@ class TodosController < ApplicationController
@projects = current_user.projects.find(:all, :include => [ :todos ])
@contexts = current_user.contexts.find(:all, :include => [ :todos ])
@contexts_to_show = @contexts.reject {|x| x.hide? }
@contexts_to_show = @contexts.reject {|x| x.hide? }
respond_to do |format|
format.html &render_todos_html
format.m &render_todos_mobile
@ -409,19 +409,11 @@ class TodosController < ApplicationController
def init_todos
with_feed_query_scope do
with_parent_resource_scope do
with_parent_resource_scope do # @context or @project may get defined here
with_limit_scope do
if mobile?
@todos, @page = current_user.todos.paginate(:all,
:conditions => ['state = ?', 'active' ], :include => [:context],
:order => 'due IS NULL, due ASC, todos.created_at ASC',
:page => params[:page], :per_page => prefs.mobile_todos_per_page)
@pagination_params = { :format => :m }
@pagination_params[:context_id] = @context.to_param if @context
@pagination_params[:project_id] = @project.to_param if @project
init_todos_for_mobile_view
else
# Note: these next two finds were previously using current_users.todos.find but that broke with_scope for :limit
@ -439,6 +431,23 @@ class TodosController < ApplicationController
end
end
def init_todos_for_mobile_view
if @context or @project
conditions = ['state = ?', 'active']
else
conditions = ['state = ? AND hide = ?', 'active', false] # hidden todos should not be visible in the homepage view
end
@todos, @page = current_user.todos.paginate(:all,
:conditions => conditions,
:include => [:context],
:order => 'due IS NULL, due ASC, todos.created_at ASC',
:page => params[:page], :per_page => prefs.mobile_todos_per_page)
@pagination_params = { :format => :m }
@pagination_params[:context_id] = @context.to_param if @context
@pagination_params[:project_id] = @project.to_param if @project
end
def determine_down_count
source_view do |from|
from.todo do
@ -513,7 +522,7 @@ class TodosController < ApplicationController
else
determine_down_count
end
render :action => 'index_mobile'
end
end