diff --git a/app/controllers/feedlist_controller.rb b/app/controllers/feedlist_controller.rb index 8402a388..68c7118c 100644 --- a/app/controllers/feedlist_controller.rb +++ b/app/controllers/feedlist_controller.rb @@ -4,7 +4,13 @@ class FeedlistController < ApplicationController def index @page_title = 'TRACKS::Feeds' - init_data_for_sidebar unless mobile? + + unless mobile? + init_data_for_sidebar + else + @projects = current_user.projects + @contexts = current_user.contexts + end @active_projects = @projects.select{ |p| p.active? } @hidden_projects = @projects.select{ |p| p.hidden? } diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 86d15f5a..2e3ac3c5 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -502,7 +502,7 @@ class TodosController < ApplicationController :conditions => ['todos.user_id = ? AND todos.state = ? AND contexts.hide = ? AND (projects.state = ? OR todos.project_id IS NULL)', current_user.id, 'active', false, 'active'], :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", - :include => [ :project, :context ]) + :include => [ :project, :context, :tags ]) end def determine_down_count diff --git a/app/views/feedlist/mobile_index.rhtml b/app/views/feedlist/mobile_index.rhtml index b8c64398..8aca76c1 100644 --- a/app/views/feedlist/mobile_index.rhtml +++ b/app/views/feedlist/mobile_index.rhtml @@ -27,6 +27,9 @@