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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
0e8266f2
Commit
0e8266f2
authored
Mar 24, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use JSON type for sorting parameter (halfway)"
This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb.
parent
22a4d124
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
19 deletions
+15
-19
app/finders/pipelines_finder.rb
app/finders/pipelines_finder.rb
+11
-15
lib/api/pipelines.rb
lib/api/pipelines.rb
+4
-4
No files found.
app/finders/pipelines_finder.rb
View file @
0e8266f2
...
@@ -108,20 +108,16 @@ class PipelinesFinder
...
@@ -108,20 +108,16 @@ class PipelinesFinder
end
end
def
sort_items
(
items
)
def
sort_items
(
items
)
return
items
.
order
(
id: :desc
)
unless
params
[
:sort
].
present?
order_by
=
if
%w[id status ref user_id]
.
include?
(
params
[
:order_by
])
# Allow only indexed columns
params
[
:sort
].
each
do
|
s
|
params
[
:order_by
]
order_by
=
if
%w[id status ref user_id]
.
include?
(
s
[
'order_by'
])
# Allow only indexed columns
s
[
'order_by'
]
else
else
:id
:id
end
end
sort
=
if
s
[
'asc_desc'
]
=~
/\A(ASC|DESC)\z/i
sort
=
if
params
[
:sort
]
=~
/\A(ASC|DESC)\z/i
s
[
'asc_desc'
]
params
[
:sort
]
else
else
:desc
:desc
end
end
items
=
items
.
order
(
order_by
=>
sort
)
items
.
order
(
order_by
=>
sort
)
end
items
end
end
end
end
lib/api/pipelines.rb
View file @
0e8266f2
...
@@ -22,10 +22,10 @@ module API
...
@@ -22,10 +22,10 @@ module API
optional
:yaml_errors
,
type:
Boolean
,
desc:
'If true, returns only yaml error pipelines'
optional
:yaml_errors
,
type:
Boolean
,
desc:
'If true, returns only yaml error pipelines'
optional
:name
,
type:
String
,
desc:
'The name of user who triggered pipelines'
optional
:name
,
type:
String
,
desc:
'The name of user who triggered pipelines'
optional
:username
,
type:
String
,
desc:
'The username of user who triggered pipelines'
optional
:username
,
type:
String
,
desc:
'The username of user who triggered pipelines'
optional
:
sort
,
type:
JSON
,
desc:
'order_by and asc_desc'
do
optional
:
order_by
,
type:
String
,
values:
%w[id status ref user_id]
,
default:
'id'
,
requires
:order_by
,
type:
String
,
values:
%w[id status ref user_id]
desc:
'The order_by which is combined with a sort'
requires
:asc_desc
,
type:
String
,
values:
%w[asc desc]
optional
:sort
,
type:
String
,
values:
%w[asc desc]
,
default:
'desc'
,
end
desc:
'The sort method which is combined with an order_by'
end
end
get
':id/pipelines'
do
get
':id/pipelines'
do
authorize!
:read_pipeline
,
user_project
authorize!
:read_pipeline
,
user_project
...
...
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