Makes user unwatch what he can no longer view after its permissions have changed (#3589).

A rake task (redmine:watchers:prune) is also added to prune existing watchers.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3167 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/member_role.rb b/app/models/member_role.rb
index 5a31c17c5..286659fc3 100644
--- a/app/models/member_role.rb
+++ b/app/models/member_role.rb
@@ -49,6 +49,11 @@ class MemberRole < ActiveRecord::Base
   end
   
   def remove_role_from_group_users
-    MemberRole.find(:all, :conditions => { :inherited_from => id }).each(&:destroy)
+    MemberRole.find(:all, :conditions => { :inherited_from => id }).group_by(&:member).each do |member, member_roles|
+      member_roles.each(&:destroy)
+      if member && member.user
+        Watcher.prune(:user => member.user, :project => member.project)
+      end
+    end
   end
 end