Commit 284cf0bf authored by Shinya Maeda's avatar Shinya Maeda

Add name. Improve order_and_sort.

parent 17580029
...@@ -12,6 +12,7 @@ class PipelinesFinder ...@@ -12,6 +12,7 @@ class PipelinesFinder
items = by_scope(items) items = by_scope(items)
items = by_status(items) items = by_status(items)
items = by_ref(items) items = by_ref(items)
items = by_name(items)
items = by_username(items) items = by_username(items)
items = by_yaml_errors(items) items = by_yaml_errors(items)
order_and_sort(items) order_and_sort(items)
...@@ -107,12 +108,16 @@ class PipelinesFinder ...@@ -107,12 +108,16 @@ class PipelinesFinder
end end
def order_and_sort(items) def order_and_sort(items)
if params[:order_by].present? && params[:sort].present? && order_by = if params[:order_by].present? && items.column_names.include?(params[:order_by])
items.column_names.include?(params[:order_by]) && params[:order_by]
params[:sort] =~ /\A(ASC|DESC)\z/i else
items.reorder(params[:order_by] => params[:sort]) :id
else end
items.reorder(id: :desc) sort = if params[:sort].present? && params[:sort] =~ /\A(ASC|DESC)\z/i
end params[:sort]
else
:desc
end
items.reorder(order_by => sort)
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment