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

add title to recurring todos page and fix for #737

Browse source
This commit is contained in:
Reinier Balt 2008-08-01 14:19:37 +02:00
parent 87b383f209
commit 545b4e5c50
5 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/recurring_todos_controller.rb
View file

@ -11,6 +11,8 @@ class RecurringTodosController < ApplicationController
@no_recurring_todos = @recurring_todos.size == 0
@no_completed_recurring_todos = @completed_recurring_todos.size == 0
@count = @recurring_todos.size
@page_title = "TRACKS::Recurring Actions"
end
def new

15
app/controllers/todos_controller.rb
View file

@ -333,18 +333,19 @@ class TodosController < ApplicationController
@tag_name = params[:name]
# mobile tags are routed with :name ending on .m. So we need to chomp it
if mobile?
@tag_name = @tag_name.chomp('.m')
end
@tag_name = @tag_name.chomp('.m') if mobile?
@tag = Tag.find_by_name(@tag_name)
if @tag.nil?
@tag = Tag.new(:name => @tag_name)
end
@tag = Tag.new(:name => @tag_name) if @tag.nil?
tag_collection = @tag.todos
@not_done_todos = tag_collection.find(:all, :conditions => ['taggings.user_id = ? and state = ?', current_user.id, 'active'])
@hidden_todos = current_user.todos.find(:all,
:include => [:taggings, :tags, :context],
:conditions => ['tags.name = ? AND (todos.state = ? OR (contexts.hide = ? AND todos.state = ?))', @tag_name, 'project_hidden', true, 'active'])
#@hidden_todos = tag_collection.find(:all, :conditions => ['taggings.user_id = ? and state = ?', current_user.id, 'project_hidden'])
@contexts = current_user.contexts.find(:all, :include => [ :todos ])
@contexts = current_user.contexts.find(:all)
@contexts_to_show = @contexts.reject {|x| x.hide? }
@deferred = tag_collection.find(:all, :conditions => ['taggings.user_id = ? and state = ?', current_user.id, 'deferred'])