From c2967c452e2a3d781323f47ac9752f64145a6032 Mon Sep 17 00:00:00 2001
From: bsag <bsag@a4c988fc-2ded-0310-b66e-134b36920a42>
Date: Sat, 13 May 2006 14:25:56 +0000
Subject: [PATCH] My overzealous find-and-replace of the @response, @request
 etc. variables in [239] broke the iCal feeds. This is now fixed.

Changed the content-type of the iCal feeds to text/calendar which should fix problems with Mozilla Calendar. The feeds still work with iCal. Fixes #273.




git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@242 a4c988fc-2ded-0310-b66e-134b36920a42
---
 tracks/app/controllers/feed_controller.rb | 8 ++++----
 tracks/app/views/feed/projects_rss.rxml   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tracks/app/controllers/feed_controller.rb b/tracks/app/controllers/feed_controller.rb
index 95ec646e..24bb9f31 100644
--- a/tracks/app/controllers/feed_controller.rb
+++ b/tracks/app/controllers/feed_controller.rb
@@ -46,7 +46,7 @@ class FeedController < ApplicationController
     else    
       @contexts = @user.contexts.find_all_by_hide(false, "position ASC")
     end
-    headers["Content-Type"] = "text/plain; charset=utf-8"
+    headers["Content-Type"] = "text/calendar"
   end
 
   def list_projects_only
@@ -119,16 +119,16 @@ protected
     
     def initialize
       @queries = Array.new
-      params = Array.new
+      @params = Array.new
     end
     
     def add(query, param)
        @queries << query
-       params << param
+       @params << param
     end
     
     def to_conditions
-      [@queries.join(' AND ')] + params
+      [@queries.join(' AND ')] + @params
     end
   end
   
diff --git a/tracks/app/views/feed/projects_rss.rxml b/tracks/app/views/feed/projects_rss.rxml
index 36b14456..eec0f3b4 100644
--- a/tracks/app/views/feed/projects_rss.rxml
+++ b/tracks/app/views/feed/projects_rss.rxml
@@ -11,7 +11,7 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
 			 	project_description = ''
 			 	project_description += sanitize(markdown( p.description )) if p.description_present?
 			 	project_description += "<p>#{p.count_undone_todos}. "
-			 	project_description += "Project is #{p.done ? 'Done' : 'Active'}. "
+			 	project_description += "Project is #{p.done? ? 'Done' : 'Active'}. "
 			 	project_description += "<a href=\"#{p.linkurl}\">#{p.linkurl}</a>" if p.linkurl_present?
 			 	project_description += "</p>"
 		 		xml.description(project_description)