projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
3618: make sure something happens if the order param is actually detected as an array
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
application_controller.rb
diff --git
a/apps/workbench/app/controllers/application_controller.rb
b/apps/workbench/app/controllers/application_controller.rb
index 3d82b23ba5b17a65a189d3ee9c577043b94caff9..27e388be20abaebea1830a5c8bcd705d4c581ea0 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-118,7
+118,9
@@
class ApplicationController < ActionController::Base
def load_filters_and_paging_params
if params[:order].blank?
@order = 'created_at desc'
- elsif !params[:order].is_a? Array
+ elsif params[:order].is_a? Array
+ @order = params[:order]
+ else
begin
@order = JSON.load(params[:order])
rescue