Fixes a bug with group member administration

Group owners were not able to remove any users from their group if they were the only owner.

Fixes a bug with group member administration
Group owners were not able to remove any users from their group if they were the only owner.
Matt DeTullio
1 parent c3f088d2
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
app/models/ability.rb
features/group.feature
@@ -240,6 +240,7 @@ class Ability
       can_manage = group_abilities(user, group).include?(:manage_group)
       if can_manage && (user != target_user)
         rules << :modify
+        rules << :destroy
       end
       if !group.last_owner?(user) && (can_manage || (user == target_user))
         rules << :destroy
@@ -74,7 +74,7 @@ Feature: Groups
     When I visit group "Owned" members page
     Then I should see user "John Doe" in team list
     Then I should see user "Mary Jane" in team list
-    Then I should not see the "Remove User From Group" button for "Mary Jane"
+    Then I should not see the "Remove User From Group" button for "John Doe"
  
   @javascript
   Scenario: Guest should be able to remove himself from group
...	...	@@ -240,6 +240,7 @@ class Ability
240	240	can_manage = group_abilities(user, group).include?(:manage_group)
241	241	if can_manage && (user != target_user)
242	242	rules << :modify
	243	+ rules << :destroy
243	244	end
244	245	if !group.last_owner?(user) && (can_manage \|\| (user == target_user))
245	246	rules << :destroy
...	...
...	...	@@ -74,7 +74,7 @@ Feature: Groups
74	74	When I visit group "Owned" members page
75	75	Then I should see user "John Doe" in team list
76	76	Then I should see user "Mary Jane" in team list
77		- Then I should not see the "Remove User From Group" button for "Mary Jane"
	77	+ Then I should not see the "Remove User From Group" button for "John Doe"
78	78
79	79	@javascript
80	80	Scenario: Guest should be able to remove himself from group
...	...