summaryrefslogtreecommitdiffstats
path: root/app/views/users
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-07-11 14:51:07 +0000
committerGo MAEDA <maeda@farend.jp>2018-07-11 14:51:07 +0000
commit87a671ce75fd2b1d402b96df4fb92f55e6009fd4 (patch)
tree1897e3d21c4569f55c8aa70dfd2913c0754c1734 /app/views/users
parent3a894f3a9112fcba80fc95d4edf17c5783bcdbdb (diff)
downloadredmine-87a671ce75fd2b1d402b96df4fb92f55e6009fd4.tar.gz
redmine-87a671ce75fd2b1d402b96df4fb92f55e6009fd4.zip
Add my activities to my page (#2471).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17443 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/show.html.erb16
1 files changed, 1 insertions, 15 deletions
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 3907d6192..84e95ead5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -51,21 +51,7 @@
<h3><%= link_to l(:label_activity), :controller => 'activities',
:action => 'index', :id => nil, :user_id => @user,
:from => @events_by_day.keys.first %></h3>
-
-<div id="activity">
-<% @events_by_day.keys.sort.reverse_each do |day| %>
-<h4><%= format_activity_day(day) %></h4>
-<dl>
-<% 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 class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
-<% end -%>
-</dl>
-<% end -%>
-</div>
+<%= render :partial => 'activities/activities', :locals => {:events_by_day => @events_by_day} %>
<% other_formats_links do |f| %>
<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>