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
This commit is contained in:
bsag 2006-05-13 14:25:56 +00:00
parent 1129cc8ca6
commit c2967c452e
2 changed files with 5 additions and 5 deletions

View file

@ -46,7 +46,7 @@ class FeedController < ApplicationController
else else
@contexts = @user.contexts.find_all_by_hide(false, "position ASC") @contexts = @user.contexts.find_all_by_hide(false, "position ASC")
end end
headers["Content-Type"] = "text/plain; charset=utf-8" headers["Content-Type"] = "text/calendar"
end end
def list_projects_only def list_projects_only
@ -119,16 +119,16 @@ protected
def initialize def initialize
@queries = Array.new @queries = Array.new
params = Array.new @params = Array.new
end end
def add(query, param) def add(query, param)
@queries << query @queries << query
params << param @params << param
end end
def to_conditions def to_conditions
[@queries.join(' AND ')] + params [@queries.join(' AND ')] + @params
end end
end end

View file

@ -11,7 +11,7 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
project_description = '' project_description = ''
project_description += sanitize(markdown( p.description )) if p.description_present? project_description += sanitize(markdown( p.description )) if p.description_present?
project_description += "<p>#{p.count_undone_todos}. " 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 += "<a href=\"#{p.linkurl}\">#{p.linkurl}</a>" if p.linkurl_present?
project_description += "</p>" project_description += "</p>"
xml.description(project_description) xml.description(project_description)