Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix the project feeds

  • Loading branch information...
commit 141ceeb0e843be8f22d559a3196f7c3ead8d8d08 1 parent efb006b
James Urquhart authored
2  app/controllers/feed_controller.rb
View
@@ -135,7 +135,7 @@ def recent_milestones
end
end
- def project_milestones
+ def milestones
begin
@project = Project.find(params[:project])
rescue ActiveRecord::RecordNotFound
2  app/controllers/milestones_controller.rb
View
@@ -139,7 +139,7 @@ def open
authorize! :change_status, @milestone
return error_status(true, :milestone_already_open) unless (@milestone.is_completed?)
- @milestone.set_completed(false)
+ @milestone.set_completed(false, @logged_user)
error_status(true, :error_saving) unless @milestone.save
redirect_back_or_default milestone_path(:id => @milestone.id)
0  app/views/feed/project_milestones.rss.builder → app/views/feed/milestones.rss.builder
View
File renamed without changes
4 app/views/feed/project_activities.rss.builder
View
@@ -12,12 +12,12 @@ xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
item_url = activity.rel_object ? activity.rel_object.object_url(Rails.configuration.site_url) : root_url
xml.title "#{activity.friendly_action} #{activity.object_name}"
- xml.category activity.project.name, activity.created_by.display_name
+ xml.category activity.project.name, activity.created_by.try(:display_name)
xml.link item_url
xml.guid item_url
xml.pubDate CGI.rfc1123_date(activity.created_on)
- xml.tag!('dc:creator', activity.created_by.display_name)
+ xml.tag!('dc:creator', activity.created_by.try(:display_name))
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.