From 1dff683ea7368466c4a43cbfffcd62b6a3aef87d Mon Sep 17 00:00:00 2001 From: lrbalt Date: Sat, 6 Oct 2007 20:07:25 +0000 Subject: [PATCH] Fixes the 500 error when clicking a tag from project view. Fixes #583. Also removes two queries that are called twice git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@612 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/projects_controller.rb | 2 -- tracks/app/helpers/todos_helper.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tracks/app/controllers/projects_controller.rb b/tracks/app/controllers/projects_controller.rb index f960e9d1..0df711ab 100644 --- a/tracks/app/controllers/projects_controller.rb +++ b/tracks/app/controllers/projects_controller.rb @@ -26,8 +26,6 @@ class ProjectsController < ApplicationController def show init_data_for_sidebar - @projects = current_user.projects - @contexts = current_user.contexts @page_title = "TRACKS::Project: #{@project.name}" @not_done = @project.not_done_todos(:include_project_hidden_todos => true) @deferred = @project.deferred_todos diff --git a/tracks/app/helpers/todos_helper.rb b/tracks/app/helpers/todos_helper.rb index 04ad65c8..93274b80 100644 --- a/tracks/app/helpers/todos_helper.rb +++ b/tracks/app/helpers/todos_helper.rb @@ -73,7 +73,7 @@ module TodosHelper def tag_list tags_except_starred = @todo.tags.reject{|t| t.name == Todo::STARRED_TAG_NAME} - tag_list = tags_except_starred.collect{|t| "" + link_to(t.name, :action => "tag", :id => t.name) + ""}.join('') + tag_list = tags_except_starred.collect{|t| "" + link_to(t.name, :controller => "todos", :action => "tag", :id => t.name) + ""}.join('') "#{tag_list}" end