jro_apps/redmine Commit - r11070:5fea79504c74

Don't remove watchers on permission change....

Jean-Philippe Lang -

r11070:5fea79504c74

parent child

Context file:

r11070:5fea79504c74

Collapse all files

app/models/member.rb 0 -11

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Member < ActiveRecord::Base
               belongs_to :user
               belongs_to :principal, :foreign_key => 'user_id'
               has_many :member_roles, :dependent => :destroy
               has_many :roles, :through => :member_roles
               belongs_to :project
               validates_presence_of :principal, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               validate :validate_role
               before_destroy :set_issue_category_nil
-              after_destroy :unwatch_from_permission_change
               def role
               end
               def role=
               end
               def name
                 self.user.name
               end
               alias :base_role_ids= :role_ids=
               def role_ids=(arg)
                 ids = (arg || []).collect(&:to_i) - [0]
                 # Keep inherited roles
                 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
                 new_role_ids = ids - role_ids
                 # 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_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)
                 a, b = roles.sort.first, member.roles.sort.first
                 if a == b
                   if principal
                     principal <=> member.principal
                   else
                   end
                 elsif a
                   a <=> b
                 else
                 end
               end
               def deletable?
                 member_roles.detect {|mr| mr.inherited_from}.nil?
               end
               def include?(user)
                 if principal.is_a?(Group)
                   !user.nil? && user.groups.include?(principal)
                 else
                   self.user == user
                 end
               end
               def set_issue_category_nil
                 if user
                   # remove category based auto assignments for this member
                   IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
                 end
               end
               # Find or initilize a Member with an id, attributes, and for a Principal
               def self.edit_membership(id, new_attributes, principal=nil)
                 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
                 @membership.attributes = new_attributes
                 @membership
               end
               # Finds or initilizes a Member for the given project and principal
               def self.find_or_new(project, principal)
                 project_id = project.is_a?(Project) ? project.id : project
                 principal_id = principal.is_a?(Principal) ? principal.id : principal
                 member = Member.find_by_project_id_and_user_id(project_id, principal_id)
                 member ||= Member.new(:project_id => project_id, :user_id => principal_id)
                 member
               end
               protected
               def validate_role
                 errors.add_on_empty :role 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

app/models/member_role.rb 0 -3

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MemberRole < ActiveRecord::Base
               belongs_to :member
               belongs_to :role
               after_destroy :remove_member_if_empty
               after_create :add_role_to_group_users, :add_role_to_subprojects
               after_destroy :remove_inherited_roles
               validates_presence_of :role
               validate :validate_role_member
               def validate_role_member
                 errors.add :role_id, :invalid if role && !role.member?
               end
               def inherited?
                 !inherited_from.nil?
               end
               private
               def remove_member_if_empty
                 if member.roles.empty?
                   member.destroy
                 end
               end
               def add_role_to_group_users
                 if member.principal.is_a?(Group) && !inherited?
                   member.principal.users.each do |user|
                     user_member = Member.find_or_new(member.project_id, user.id)
                     user_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
                     user_member.save!
                   end
                 end
               end
               def add_role_to_subprojects
                 member.project.children.each do |subproject|
                   if subproject.inherit_members?
                     child_member = Member.find_or_new(subproject.id, member.user_id)
                     child_member.member_roles << MemberRole.new(:role => role, :inherited_from => id)
                     child_member.save!
                   end
                 end
               end
               def remove_inherited_roles
                 MemberRole.where(:inherited_from => id).all.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

test/unit/member_test.rb 0 -66

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class MemberTest < ActiveSupport::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :groups_users,
                        :watchers,
                        :journals, :journal_details,
                        :messages,
                        :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
                        :boards
               include Redmine::I18n
               def setup
                 @jsmith = Member.find(1)
               end
               def test_create
                 member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
                 assert member.save
                 member.reload
                 assert_equal 2, member.roles.size
                 assert_equal Role.find(1), member.roles.sort.first
               end
               def test_update
                 assert_equal "eCookbook", @jsmith.project.name
                 assert_equal "Manager", @jsmith.roles.first.name
                 assert_equal "jsmith", @jsmith.user.login
                 @jsmith.mail_notification = !@jsmith.mail_notification
                 assert @jsmith.save
               end
               def test_update_roles
                 assert_equal 1, @jsmith.roles.size
                 @jsmith.role_ids = [1, 2]
                 assert @jsmith.save
                 assert_equal 2, @jsmith.reload.roles.size
               end
               def test_validate
                 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
                 # same use can't have more than one membership for a project
                 assert !member.save
                 # must have one role at least
                 user = User.new(:firstname => "new1", :lastname => "user1", :mail => "test_validate@somenet.foo")
                 user.login = "test_validate"
                 user.password, user.password_confirmation = "password", "password"
                 assert user.save
                 set_language_if_valid 'fr'
                 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [])
                 assert !member.save
                 assert_include I18n.translate('activerecord.errors.messages.empty'), member.errors[:role]
                 str = "R\xc3\xb4le doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 assert_equal str, [member.errors.full_messages].flatten.join
               end
               def test_validate_member_role
                 user = User.new(:firstname => "new1", :lastname => "user1", :mail => "test_validate@somenet.foo")
                 user.login = "test_validate_member_role"
                 user.password, user.password_confirmation = "password", "password"
                 assert user.save
                 member = Member.new(:project_id => 1, :user_id => user.id, :role_ids => [5])
                 assert !member.save
               end
               def test_destroy
                 category1 = IssueCategory.find(1)
                 assert_equal @jsmith.user.id, category1.assigned_to_id
                 assert_difference 'Member.count', -1 do
                   assert_difference 'MemberRole.count', -1 do
                     @jsmith.destroy
                   end
                 end
                 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
                 category1.reload
                 assert_nil category1.assigned_to_id
               end
               def test_sort_without_roles
                 a = Member.new(:roles => [Role.first])
                 b = Member.new
                 assert_equal -1, a <=> b
                 assert_equal 1,  b <=> a
               end
               def test_sort_without_principal
                 role = Role.first
                 a = Member.new(:roles => [role], :principal => User.first)
                 b = Member.new(:roles => [role])
                 assert_equal -1, a <=> b
                 assert_equal 1,  b <=> a
               end
-              context "removing permissions" do
-                setup do
-                  Watcher.delete_all("user_id = 9")
-                  user = User.find(9)
-                  # public
-                  Watcher.create!(:watchable => Issue.find(1), :user => user)
-                  # private
-                  Watcher.create!(:watchable => Issue.find(4), :user => user)
-                  Watcher.create!(:watchable => Message.find(7), :user => user)
-                  Watcher.create!(:watchable => Wiki.find(2), :user => user)
-                  Watcher.create!(:watchable => WikiPage.find(3), :user => user)
-                end
-                context "of user" do
-                  setup do
-                    @member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2])
-                  end
-                  context "by deleting membership" do
-                    should "prune watchers" do
-                      assert_difference 'Watcher.count', -4 do
-                        @member.destroy
-                      end
-                    end
-                  end
-                  context "by updating roles" do
-                    should "prune watchers" do
-                      Role.find(2).remove_permission! :view_wiki_pages
-                      member = Member.first(:order => 'id desc')
-                      assert_difference 'Watcher.count', -2 do
-                        member.role_ids = [2]
-                        member.save
-                      end
-                      assert !Message.find(7).watched_by?(@user)
-                    end
-                  end
-                end
-                context "of group" do
-                  setup do
-                    group = Group.find(10)
-                    @member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2])
-                    group.users << User.find(9)
-                  end
-                  context "by deleting membership" do
-                    should "prune watchers" do
-                      assert_difference 'Watcher.count', -4 do
-                        @member.destroy
-                      end
-                    end
-                  end
-                  context "by updating roles" do
-                    should "prune watchers" do
-                      Role.find(2).remove_permission! :view_wiki_pages
-                      assert_difference 'Watcher.count', -2 do
-                        @member.role_ids = [2]
-                        @member.save
-                      end
-                    end
-                  end
-                end
-              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages