mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-10 19:23:06 +00:00
Merged r22182 from trunk to 5.0-stable (#37166).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22183 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
e16a11a22a
commit
3407366017
@ -52,7 +52,7 @@ class MemberRole < ActiveRecord::Base
|
||||
private
|
||||
|
||||
def remove_member_if_empty
|
||||
if @member_removal != false && member.roles.empty?
|
||||
if @member_removal != false && member.roles.reload.empty?
|
||||
member.destroy
|
||||
end
|
||||
end
|
||||
|
||||
@ -225,4 +225,14 @@ class MemberTest < ActiveSupport::TestCase
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def test_destroy_member_when_member_role_is_empty
|
||||
member = Member.find(1)
|
||||
|
||||
assert_difference 'Member.count', -1 do
|
||||
member.role_ids = [] # Destroy roles associated with member
|
||||
end
|
||||
assert member.destroyed?
|
||||
assert_raise(ActiveRecord::RecordNotFound) { Member.find(1) }
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user