Download as
Browse Code »

Commit 98044f0f143552943b8afad0c8133f236a857adb

Authored by Andrey Kumanyaev
1 parent 39e7a0ea
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Code duplication removed from controllers

Showing 3 changed files with 8 additions and 6 deletions   Show diff stats
app/controllers/admin/groups_controller.rb
  Diff comments   View file @98044f0
... ... @@ -68,9 +68,7 @@ class Admin::GroupsController < AdminController
68 68 end
69 69  
70 70 def project_teams_update
71   - @group.projects.each do |project|
72   - project.add_users_ids_to_team(params[:user_ids], params[:project_access])
73   - end
  71 + @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
74 72 redirect_to [:admin, @group], notice: 'Users was successfully added.'
75 73 end
76 74  
... ...
app/controllers/groups_controller.rb
  Diff comments   View file @98044f0
... ... @@ -59,9 +59,7 @@ class GroupsController < ApplicationController
59 59 end
60 60  
61 61 def team_members
62   - @group.projects.each do |project|
63   - project.add_users_ids_to_team(params[:user_ids], params[:project_access])
64   - end
  62 + @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
65 63 redirect_to people_group_path(@group), notice: 'Users was successfully added.'
66 64 end
67 65  
... ...
app/models/group.rb
  Diff comments   View file @98044f0
... ... @@ -12,6 +12,12 @@
12 12 #
13 13  
14 14 class Group < Namespace
  15 + def add_users_to_project_teams(user_ids, project_access)
  16 + projects.each do |project|
  17 + project.add_users_ids_to_team(user_ids, project_access)
  18 + end
  19 + end
  20 +
15 21 def users
16 22 users = User.joins(:users_projects).where(users_projects: {project_id: project_ids})
17 23 users = users << owner
... ...