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.count_undone_todos}. " - project_description += "Project is #{p.done ? 'Done' : 'Active'}. " + project_description += "Project is #{p.done? ? 'Done' : 'Active'}. " project_description += "#{p.linkurl}" if p.linkurl_present? project_description += "
" xml.description(project_description)