Commit 32ef2f37f6a3eee713638bdf4da8c5ee2c570169
1 parent
ed9cff9a
Exists in
master
and in
4 other branches
Add owner to group members after group create
Showing
2 changed files
with
14 additions
and
18 deletions
Show diff stats
app/controllers/groups_controller.rb
| @@ -72,7 +72,7 @@ class GroupsController < ApplicationController | @@ -72,7 +72,7 @@ class GroupsController < ApplicationController | ||
| 72 | 72 | ||
| 73 | def update | 73 | def update |
| 74 | group_params = params[:group].dup | 74 | group_params = params[:group].dup |
| 75 | - owner_id =group_params.delete(:owner_id) | 75 | + owner_id = group_params.delete(:owner_id) |
| 76 | 76 | ||
| 77 | if owner_id | 77 | if owner_id |
| 78 | @group.owner = User.find(owner_id) | 78 | @group.owner = User.find(owner_id) |
app/models/group.rb
| @@ -16,29 +16,25 @@ class Group < Namespace | @@ -16,29 +16,25 @@ class Group < Namespace | ||
| 16 | has_many :users_groups, dependent: :destroy | 16 | has_many :users_groups, dependent: :destroy |
| 17 | has_many :users, through: :users_groups | 17 | has_many :users, through: :users_groups |
| 18 | 18 | ||
| 19 | - def add_users(user_ids, group_access) | ||
| 20 | - user_ids.compact.each do |user_id| | ||
| 21 | - self.users_groups.create(user_id: user_id, group_access: group_access) | ||
| 22 | - end | ||
| 23 | - end | ||
| 24 | - | ||
| 25 | - def add_users_to_project_teams(user_ids, project_access) | ||
| 26 | - UsersProject.add_users_into_projects( | ||
| 27 | - projects.map(&:id), | ||
| 28 | - user_ids, | ||
| 29 | - project_access | ||
| 30 | - ) | ||
| 31 | - end | 19 | + after_create :add_owner |
| 32 | 20 | ||
| 33 | def human_name | 21 | def human_name |
| 34 | name | 22 | name |
| 35 | end | 23 | end |
| 36 | 24 | ||
| 37 | - def truncate_teams | ||
| 38 | - UsersProject.truncate_teams(project_ids) | ||
| 39 | - end | ||
| 40 | - | ||
| 41 | def owners | 25 | def owners |
| 42 | @owners ||= (users_groups.owners.map(&:user) << owner) | 26 | @owners ||= (users_groups.owners.map(&:user) << owner) |
| 43 | end | 27 | end |
| 28 | + | ||
| 29 | + def add_users(user_ids, group_access) | ||
| 30 | + user_ids.compact.each do |user_id| | ||
| 31 | + self.users_groups.create(user_id: user_id, group_access: group_access) | ||
| 32 | + end | ||
| 33 | + end | ||
| 34 | + | ||
| 35 | + private | ||
| 36 | + | ||
| 37 | + def add_owner | ||
| 38 | + self.add_users([owner.id], UsersGroup::OWNER) | ||
| 39 | + end | ||
| 44 | end | 40 | end |