Commit 97cf31c4cb36c4d7f259f768f04a8e995da1d278
1 parent
2c0c9e26
Exists in
master
and in
4 other branches
Update user access level when adding to group.
Showing
2 changed files
with
14 additions
and
1 deletions
Show diff stats
app/models/group.rb
| ... | ... | @@ -26,7 +26,8 @@ class Group < Namespace |
| 26 | 26 | |
| 27 | 27 | def add_users(user_ids, group_access) |
| 28 | 28 | user_ids.compact.each do |user_id| |
| 29 | - self.users_groups.create(user_id: user_id, group_access: group_access) | |
| 29 | + user = self.users_groups.find_or_initialize_by_user_id(user_id) | |
| 30 | + user.update_attributes(group_access: group_access) | |
| 30 | 31 | end |
| 31 | 32 | end |
| 32 | 33 | ... | ... |
spec/models/group_spec.rb
| ... | ... | @@ -42,4 +42,16 @@ describe Group do |
| 42 | 42 | |
| 43 | 43 | it { group.users_groups.masters.map(&:user).should include(user) } |
| 44 | 44 | end |
| 45 | + | |
| 46 | + describe :add_users do | |
| 47 | + let(:user) { create(:user) } | |
| 48 | + before { group.add_users([user.id], UsersGroup::GUEST) } | |
| 49 | + | |
| 50 | + it "should update the group permission" do | |
| 51 | + group.users_groups.guests.map(&:user).should include(user) | |
| 52 | + group.add_users([user.id], UsersGroup::DEVELOPER) | |
| 53 | + group.users_groups.developers.map(&:user).should include(user) | |
| 54 | + group.users_groups.guests.map(&:user).should_not include(user) | |
| 55 | + end | |
| 56 | + end | |
| 45 | 57 | end | ... | ... |