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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
21a896b5
Commit
21a896b5
authored
May 26, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move per_page to load_users_by_ability method
parent
41b97994
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+2
-2
No files found.
app/controllers/autocomplete_controller.rb
View file @
21a896b5
...
@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController
...
@@ -9,7 +9,7 @@ class AutocompleteController < ApplicationController
@users
=
@users
.
where
.
not
(
id:
params
[
:skip_users
])
if
params
[
:skip_users
].
present?
@users
=
@users
.
where
.
not
(
id:
params
[
:skip_users
])
if
params
[
:skip_users
].
present?
@users
=
@users
.
active
@users
=
@users
.
active
@users
=
@users
.
reorder
(
:name
)
@users
=
@users
.
reorder
(
:name
)
@users
=
load_users_by_ability
.
per
(
params
[
:per_page
])
||
@users
.
page
(
params
[
:page
]).
per
(
params
[
:per_page
])
@users
=
load_users_by_ability
||
@users
.
page
(
params
[
:page
]).
per
(
params
[
:per_page
])
if
params
[
:todo_filter
].
present?
&&
current_user
if
params
[
:todo_filter
].
present?
&&
current_user
@users
=
@users
.
todo_authors
(
current_user
.
id
,
params
[
:todo_state_filter
])
@users
=
@users
.
todo_authors
(
current_user
.
id
,
params
[
:todo_state_filter
])
...
@@ -63,7 +63,7 @@ class AutocompleteController < ApplicationController
...
@@ -63,7 +63,7 @@ class AutocompleteController < ApplicationController
@users
.
to_a
@users
.
to_a
.
select
{
|
user
|
user
.
can?
(
ability
,
@project
)
}
.
select
{
|
user
|
user
.
can?
(
ability
,
@project
)
}
.
take
(
Kaminari
.
config
.
default_per_page
)
.
take
(
params
[
:per_page
]
&
.
to_i
||
Kaminari
.
config
.
default_per_page
)
end
end
def
find_users
def
find_users
...
...
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