From 0e8266f2386351906e2d6357282e011d373b2c94 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 24 Mar 2017 16:06:19 +0900
Subject: [PATCH] Revert "Use JSON type for sorting parameter (halfway)"
This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb.
---
app/finders/pipelines_finder.rb | 26 +++++++++++---------------
lib/api/pipelines.rb | 8 ++++----
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/app/finders/pipelines_finder.rb b/app/finders/pipelines_finder.rb
index d56cf8fe790..22507472e15 100644
--- a/app/finders/pipelines_finder.rb
+++ b/app/finders/pipelines_finder.rb
@@ -108,20 +108,16 @@ class PipelinesFinder
end
def sort_items(items)
- return items.order(id: :desc) unless params[:sort].present?
- params[:sort].each do |s|
- order_by = if %w[id status ref user_id].include?(s['order_by']) # Allow only indexed columns
- s['order_by']
- else
- :id
- end
- sort = if s['asc_desc'] =~ /\A(ASC|DESC)\z/i
- s['asc_desc']
- else
- :desc
- end
- items = items.order(order_by => sort)
- end
- items
+ order_by = if %w[id status ref user_id].include?(params[:order_by]) # Allow only indexed columns
+ params[:order_by]
+ else
+ :id
+ end
+ sort = if params[:sort] =~ /\A(ASC|DESC)\z/i
+ params[:sort]
+ else
+ :desc
+ end
+ items.order(order_by => sort)
end
end
diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb
index 6bbb679cb5e..b0f586b08da 100644
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
@@ -22,10 +22,10 @@ module API
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 :username, type: String, desc: 'The username of user who triggered pipelines'
- optional :sort, type: JSON, desc: 'order_by and asc_desc' do
- requires :order_by, type: String, values: %w[id status ref user_id]
- requires :asc_desc, type: String, values: %w[asc desc]
- end
+ optional :order_by, type: String, values: %w[id status ref user_id], default: 'id',
+ desc: 'The order_by which is combined with a sort'
+ optional :sort, type: String, values: %w[asc desc], default: 'desc',
+ desc: 'The sort method which is combined with an order_by'
end
get ':id/pipelines' do
authorize! :read_pipeline, user_project
--
GitLab