X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb4efac6793d18892dde09c631895cb98c3df470..c2aceca339ec3a6f3d853865cebd0efe348ff518:/services/api/lib/load_param.rb diff --git a/services/api/lib/load_param.rb b/services/api/lib/load_param.rb index a08b8b78a5..7119eb2348 100644 --- a/services/api/lib/load_param.rb +++ b/services/api/lib/load_param.rb @@ -56,7 +56,7 @@ module LoadParam raise ArgumentError.new("Invalid value for limit parameter") end @limit = [params[:limit].to_i, - Rails.configuration.max_items_per_response].min + Rails.configuration.API.MaxItemsPerResponse].min else @limit = DEFAULT_LIMIT end @@ -151,7 +151,7 @@ module LoadParam when String begin @select = SafeJSON.load(params[:select]) - raise unless @select.is_a? Array or @select.nil? + raise unless @select.is_a? Array or @select.nil? or !@select rescue raise ArgumentError.new("Could not parse \"select\" param as an array") end