Skip to content

Commit d839f6c

Browse files
zzetdzaporozhets
authored andcommitted
Remove simple code duplication in members controllers
1 parent e52fec9 commit d839f6c

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

app/controllers/admin/teams/members_controller.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
class Admin::Teams::MembersController < Admin::Teams::ApplicationController
22
def new
3-
@users = User.active
4-
@users = @users.not_in_team(user_team) if user_team.members.any?
3+
@users = User.potential_team_members(user_team)
54
@users = UserDecorator.decorate @users
65
end
76

app/controllers/teams/members_controller.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ def index
77
end
88

99
def new
10-
@users = User.active
11-
@users = @users.not_in_team(user_team) if user_team.members.any?
10+
@users = User.potential_team_members(user_team)
1211
@users = UserDecorator.decorate @users
1312
end
1413

app/models/user.rb

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class User < ActiveRecord::Base
9191
scope :alphabetically, order('name ASC')
9292
scope :in_team, ->(team){ where(id: team.member_ids) }
9393
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
94+
scope :potential_team_members, ->(team) { team.members.any? ? active : active.not_in_team(team) }
9495

9596
#
9697
# Class methods

0 commit comments

Comments
 (0)