Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d839f6c5
Commit
d839f6c5
authored
Jan 24, 2013
by
Andrey Kumanyaev
Committed by
Dmitriy Zaporozhets
Jan 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove simple code duplication in members controllers
parent
e52fec9c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
app/controllers/admin/teams/members_controller.rb
app/controllers/admin/teams/members_controller.rb
+1
-2
app/controllers/teams/members_controller.rb
app/controllers/teams/members_controller.rb
+1
-2
app/models/user.rb
app/models/user.rb
+1
-0
No files found.
app/controllers/admin/teams/members_controller.rb
View file @
d839f6c5
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
...
...
app/controllers/teams/members_controller.rb
View file @
d839f6c5
...
@@ -7,8 +7,7 @@ class Teams::MembersController < Teams::ApplicationController
...
@@ -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
...
...
app/models/user.rb
View file @
d839f6c5
...
@@ -91,6 +91,7 @@ class User < ActiveRecord::Base
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment