diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 4e9f67d7d6..0a1d40349e 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -28,6 +28,7 @@ class MyController < ApplicationController helper :users helper :custom_fields helper :queries + helper :activities def index page diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index 9acc9e644d..a14d0547b2 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -164,4 +164,10 @@ module MyHelper render :partial => 'my/blocks/timelog', :locals => {:block => block, :entries => entries, :entries_by_day => entries_by_day, :days => days} end + + def render_my_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) + + render :partial => 'my/blocks/my_activity', :locals => {:events_by_day => events_by_day} + end end diff --git a/app/views/activities/_activities.html.erb b/app/views/activities/_activities.html.erb new file mode 100644 index 0000000000..8968d6b7e1 --- /dev/null +++ b/app/views/activities/_activities.html.erb @@ -0,0 +1,17 @@ +
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
-<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+<%= render :partial => 'activities/activities', :locals => {:events_by_day => @events_by_day} %> <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %> diff --git a/app/views/my/blocks/_my_activity.html.erb b/app/views/my/blocks/_my_activity.html.erb new file mode 100644 index 0000000000..7e148c923a --- /dev/null +++ b/app/views/my/blocks/_my_activity.html.erb @@ -0,0 +1,5 @@ +