Skip to content
Snippets Groups Projects
Commit d839f6c5 authored by Andrey Kumanyaev's avatar Andrey Kumanyaev Committed by Dmitriy Zaporozhets
Browse files

Remove simple code duplication in members controllers

parent e52fec9c
No related branches found
No related tags found
2 merge requests!2940Expanding repos and hooks paths in settings,!2746New feature: Teams
class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def new
@users = User.active
@users = @users.not_in_team(user_team) if user_team.members.any?
@users = User.potential_team_members(user_team)
@users = UserDecorator.decorate @users
end
 
Loading
Loading
Loading
Loading
@@ -7,8 +7,7 @@ class Teams::MembersController < Teams::ApplicationController
end
 
def new
@users = User.active
@users = @users.not_in_team(user_team) if user_team.members.any?
@users = User.potential_team_members(user_team)
@users = UserDecorator.decorate @users
end
 
Loading
Loading
Loading
Loading
@@ -91,6 +91,7 @@ class User < ActiveRecord::Base
scope :alphabetically, order('name ASC')
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 :potential_team_members, ->(team) { team.members.any? ? active : active.not_in_team(team) }
 
#
# Class methods
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment