# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301909288 -3600
# Node ID c80fd1ef305fc10ff5a5dbdc96bfe6cf94fc376a
# Parent  1a514b9347d48f02cb64bf4431e7a5219f769611
Ensure Recent Activity shows only activity on projects the user is actually a member of, if invoked from My Page (rather than on all permitted projects)

diff -r 1a514b9347d4 -r c80fd1ef305f app/views/activities/_recent.rhtml
--- a/app/views/activities/_recent.rhtml	Thu Mar 31 15:19:30 2011 +0100
+++ b/app/views/activities/_recent.rhtml	Mon Apr 04 10:28:08 2011 +0100
@@ -2,7 +2,11 @@
 <% max = 5 %>
 <% if (events.nil?) 
      activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
-     events = activity.events(Date.today - 28, Date.today + 1).first(max)
+     events = activity.events(Date.today - 28, Date.today + 1)
+     if defined? user
+       events = events.select { |e| user.member_of? e.project }
+     end
+     events = events.first(max)
    end
 %>
 
diff -r 1a514b9347d4 -r c80fd1ef305f app/views/my/blocks/_activitymyprojects.rhtml
--- a/app/views/my/blocks/_activitymyprojects.rhtml	Thu Mar 31 15:19:30 2011 +0100
+++ b/app/views/my/blocks/_activitymyprojects.rhtml	Mon Apr 04 10:28:08 2011 +0100
@@ -1,4 +1,4 @@
 
-<%= render :partial => 'activities/recent' %>
+<%= render :partial => 'activities/recent', :locals => { :user => User.current } %>