diff app/views/activities/_recent.rhtml @ 379:f25c73364bfb cannam-pre-20110113-merge

Merge from branch "feature_121"

--- a/app/views/activities/_recent.rhtml	Fri Apr 01 16:11:41 2011 +0100
+++ b/app/views/activities/_recent.rhtml	Mon Apr 04 10:29:54 2011 +0100
@@ -2,13 +2,21 @@
 <% max = 5 %>
 <% if (events.nil?) 
      activity = Redmine::Activity::Fetcher.new(User.current, :project => @project)
+     
      if @project
         # Don't show news (duplicated with News box) or wiki edits (too
 	# tedious) in project front page
         activity.scope = [ "changesets", "files", "issues", "documents" ]
      end
+     
+     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)
 
-     events = activity.events(Date.today - 28, Date.today + 1).first(max)
    end
 %>