From 32ef2f37f6a3eee713638bdf4da8c5ee2c570169 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Jun 2013 16:56:31 +0300 Subject: [PATCH] Add owner to group members after group create --- app/controllers/groups_controller.rb | 2 +- app/models/group.rb | 30 +++++++++++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 870a00d..f44bc10 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -72,7 +72,7 @@ class GroupsController < ApplicationController def update group_params = params[:group].dup - owner_id =group_params.delete(:owner_id) + owner_id = group_params.delete(:owner_id) if owner_id @group.owner = User.find(owner_id) diff --git a/app/models/group.rb b/app/models/group.rb index 72baa78..0593d9c 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -16,29 +16,25 @@ class Group < Namespace has_many :users_groups, dependent: :destroy has_many :users, through: :users_groups - def add_users(user_ids, group_access) - user_ids.compact.each do |user_id| - self.users_groups.create(user_id: user_id, group_access: group_access) - end - end - - def add_users_to_project_teams(user_ids, project_access) - UsersProject.add_users_into_projects( - projects.map(&:id), - user_ids, - project_access - ) - end + after_create :add_owner def human_name name end - def truncate_teams - UsersProject.truncate_teams(project_ids) - end - def owners @owners ||= (users_groups.owners.map(&:user) << owner) end + + def add_users(user_ids, group_access) + user_ids.compact.each do |user_id| + self.users_groups.create(user_id: user_id, group_access: group_access) + end + end + + private + + def add_owner + self.add_users([owner.id], UsersGroup::OWNER) + end end -- libgit2 0.21.2