From cdaed311a9e9294c34ede271317cf2e19710156d Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Mon, 30 Jun 2008 10:44:37 +0200 Subject: [PATCH 1/3] fixes #744 by removing explicit loading of Tag from application.rb the load went looking for tables for tags that did not exist when creating a new db --- app/controllers/application.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 125b282e..2cfba813 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -7,7 +7,13 @@ require "redcloth" require 'date' require 'time' -Tag # We need this in development mode, or you get 'method missing' errors + +# Commented the following line because of #744. It prevented rake db:migrate to +# run because this tag went looking for the taggings table that did not exist +# when you feshly create a new database +# Old comment: We need this in development mode, or you get 'method missing' errors +# +# Tag class ApplicationController < ActionController::Base From b74d2646b2eb2c01fae49d842ae4756d00e4c6dc Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Fri, 4 Jul 2008 12:35:49 +0200 Subject: [PATCH 2/3] somehow this change from [820] was not copied over to github. --- app/views/feedlist/index.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/feedlist/index.html.erb b/app/views/feedlist/index.html.erb index 0b37ea82..a75c01f8 100644 --- a/app/views/feedlist/index.html.erb +++ b/app/views/feedlist/index.html.erb @@ -54,6 +54,10 @@ <%= text_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %> Active projects with no next actions +
  • + <%= text_formatted_link({:controller => 'projects', :action => 'index', :projects_and_actions => true}) %> + Active projects with their actions +
  • Feeds for incomplete actions in a specific context:

      <% for context in @contexts %> @@ -84,4 +88,4 @@
      <%= render "sidebar/sidebar" %> -
      \ No newline at end of file + From a1072e0007fbc13931d2d592e3bf4136cbab54e7 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Fri, 4 Jul 2008 14:04:33 +0200 Subject: [PATCH 3/3] fix for #740 as discussed on mailing list --- app/views/todos/_todo.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb index 30090ab4..d4df682f 100644 --- a/app/views/todos/_todo.html.erb +++ b/app/views/todos/_todo.html.erb @@ -12,7 +12,7 @@ <%= remote_toggle_checkbox unless source_view_is :deferred %>
      <%= date_span -%> - <%= sanitize(todo.description) %> + <%= h sanitize(todo.description) %> <%= tag_list %> <%= deferred_due_date %> <%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>