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, 16 insertions, 1 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 6fffb2161..44a421745 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -24,6 +24,8 @@ class Member < ActiveRecord::Base
 
   validates_presence_of :principal, :project
   validates_uniqueness_of :user_id, :scope => :project_id
+
+  after_destroy :unwatch_from_permission_change
   
   def name
     self.user.name
@@ -39,7 +41,11 @@ class Member < ActiveRecord::Base
     # Add new roles
     new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
     # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
-    member_roles.select {|mr| !ids.include?(mr.role_id)}.each(&:destroy)
+    member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
+    if member_roles_to_destroy.any?
+      member_roles_to_destroy.each(&:destroy)
+      unwatch_from_permission_change
+    end
   end
   
   def <=>(member)
@@ -63,4 +69,13 @@ class Member < ActiveRecord::Base
   def validate
     errors.add_to_base "Role can't be blank" if member_roles.empty? && roles.empty?
   end
+  
+  private
+  
+  # Unwatch things that the user is no longer allowed to view inside project
+  def unwatch_from_permission_change
+    if user
+      Watcher.prune(:user => user, :project => project)
+    end
+  end
 end