diff options
| author | Go MAEDA <maeda@farend.jp> | 2017-12-25 04:38:07 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2017-12-25 04:38:07 +0000 |
| commit | f46b95107dabe2a3c1918e7d327022add640acd1 (patch) | |
| tree | e6b7346015e8df98586823abb6f1ed3899867156 /app/views | |
| parent | 21265811b9f813e6a1c9b76cb3fa115bbbd5c189 (diff) | |
| download | redmine-f46b95107dabe2a3c1918e7d327022add640acd1.tar.gz redmine-f46b95107dabe2a3c1918e7d327022add640acd1.zip | |
Render activities block on UsersController#show grouped and with event_type icon (#27240).
Patch by Mischa The Evil.
git-svn-id: http://svn.redmine.org/redmine/trunk@17128 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/users/show.html.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6d231b86d..943ee3821 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -56,12 +56,12 @@ <% @events_by_day.keys.sort.reverse.each do |day| %> <h4><%= format_activity_day(day) %></h4> <dl> -<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%> - <dt class="<%= e.event_type %>"> +<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> + <dt class="<%= e.event_type %> icon icon-<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>"> <span class="time"><%= format_time(e.event_datetime, false) %></span> <%= content_tag('span', e.project, :class => 'project') %> <%= link_to format_activity_title(e.event_title), e.event_url %></dt> - <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd> + <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span> <% end -%> </dl> <% end -%> |