projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2051-nondeterministic-jobs
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index 3101781c230916ff63b3e50118443d211833aed8..fa189aa80d2e3dcb4f1ee9025c86c4c27151fc01 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-126,7
+126,7
@@
class ApplicationController < ActionController::Base
def load_filters_param
if params[:filters].is_a? Array
@filters = params[:filters]
def load_filters_param
if params[:filters].is_a? Array
@filters = params[:filters]
- elsif params[:filters].is_a? String
+ elsif params[:filters].is_a? String
and !params[:filters].empty?
begin
@filters = Oj.load params[:filters]
raise unless @filters.is_a? Array
begin
@filters = Oj.load params[:filters]
raise unless @filters.is_a? Array