From eb32c16d26eee08bdb7919359ee5b354b9c83bc7 Mon Sep 17 00:00:00 2001 From: Jens Kraemer Date: Tue, 11 Apr 2017 12:38:12 +0800 Subject: [PATCH] adds params[:query] type check --- app/models/query.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/query.rb b/app/models/query.rb index 863bdbc..e1de238 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -374,10 +374,11 @@ class Query < ActiveRecord::Base add_short_filter(field, params[field]) if params[field] end end - self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by]) - self.column_names = params[:c] || (params[:query] && params[:query][:column_names]) - self.totalable_names = params[:t] || (params[:query] && params[:query][:totalable_names]) - self.sort_criteria = params[:sort] || (params[:query] && params[:query][:sort_criteria]) + query_params = params[:query].is_a?(ActionController::Parameters) ? params[:query] : {} + self.group_by = params[:group_by] || query_params[:group_by] + self.column_names = params[:c] || query_params[:column_names] + self.totalable_names = params[:t] || query_params[:totalable_names] + self.sort_criteria = params[:sort] || query_params[:sort_criteria] self end -- 2.1.4