deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove simple code duplication in members controllers

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-24 22:31:28 +04:00 • committed by Dmitriy Zaporozhets
parent e52fec9cd9
commit d839f6c525
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/admin/teams/members_controller.rb
View file

@ -1,7 +1,6 @@
class Admin::Teams::MembersController < Admin::Teams::ApplicationController class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def new def new
@users = User.active @users = User.potential_team_members(user_team)
@users = @users.not_in_team(user_team) if user_team.members.any?
@users = UserDecorator.decorate @users @users = UserDecorator.decorate @users
end end

3
app/controllers/teams/members_controller.rb
View file

@ -7,8 +7,7 @@ class Teams::MembersController < Teams::ApplicationController
end end
def new def new
@users = User.active @users = User.potential_team_members(user_team)
@users = @users.not_in_team(user_team) if user_team.members.any?
@users = UserDecorator.decorate @users @users = UserDecorator.decorate @users
end end

1
app/models/user.rb
View file

@ -91,6 +91,7 @@ class User < ActiveRecord::Base
scope :alphabetically, order('name ASC') scope :alphabetically, order('name ASC')
scope :in_team, ->(team){ where(id: team.member_ids) } scope :in_team, ->(team){ where(id: team.member_ids) }
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) } scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
scope :potential_team_members, ->(team) { team.members.any? ? active : active.not_in_team(team) }
# #
# Class methods # Class methods