summaryrefslogtreecommitdiffstats
path: root/app/helpers/my_helper.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-10-20 23:43:25 +0000
committerGo MAEDA <maeda@farend.jp>2018-10-20 23:43:25 +0000
commit9a53b68b73a7d39d45f74c17c1e3ddc6ff51bc87 (patch)
treeac3a964fc304813fd8a880046f0978fe7e1cdbfe /app/helpers/my_helper.rb
parentccd524a04a47d1b19adf6574ebf700dbc4a6a0c8 (diff)
downloadredmine-9a53b68b73a7d39d45f74c17c1e3ddc6ff51bc87.tar.gz
redmine-9a53b68b73a7d39d45f74c17c1e3ddc6ff51bc87.zip
Fix that MyHelper::render_activity_block is not timezone aware (#2471, #29816).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17600 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/my_helper.rb')
-rw-r--r--app/helpers/my_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb
index 8320749fc..df0c4cf1d 100644
--- a/app/helpers/my_helper.rb
+++ b/app/helpers/my_helper.rb
@@ -166,7 +166,7 @@ module MyHelper
end
def render_activity_block(block, settings)
- events_by_day = Redmine::Activity::Fetcher.new(User.current, :author => User.current).events(nil, nil, :limit => 10).group_by(&:event_date)
+ events_by_day = Redmine::Activity::Fetcher.new(User.current, :author => User.current).events(nil, nil, :limit => 10).group_by {|event| User.current.time_to_date(event.event_datetime)}
render :partial => 'my/blocks/activity', :locals => {:events_by_day => events_by_day}
end