meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-27 02:41:15 +00:00
Code Issues Releases Wiki Activity

use "do end" instead of {} at ActivitiesController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20277 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-06 13:00:44 +00:00
parent a6097d774e
commit 54281df132
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/activities_controller.rb
View File

@ -59,11 +59,11 @@ class ActivitiesController < ApplicationController
if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
respond_to do |format|
format.html {
format.html do
@events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
render :layout => false if request.xhr?
}
format.atom {
end
format.atom do
title = l(:label_activity)
if @author
title = @author.name
@ -71,7 +71,7 @@ class ActivitiesController < ApplicationController
title = l("label_#{@activity.scope.first.singularize}_plural")
end
render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
}
end
end
end