Skip to content

Commit

Permalink
[api] Merge! is deprecated
Browse files Browse the repository at this point in the history
Method merge! is deprecated and will be removed in Rails 5.1, as  no longer inherits from hash. Using this deprecated behavior exposes potential security problems. If you continue to use this method you may be creating a security vulnerability in your app that can be exploited. Instead, consider using one of these documented methods which are not deprecated: http://api.rubyonrails.org/v5.0.0.1/classes/ActionController/Parameters.html
  • Loading branch information
Ana06 committed Nov 21, 2016
1 parent 19ba59d commit 6ec5b64
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/api/app/controllers/request_controller.rb
Expand Up @@ -29,12 +29,12 @@ def render_request_collection
raise RequireFilter.new if [:project, :user, :states, :types, :reviewstates, :ids].all? { |f| params[f].blank? }

# convert comma seperated values into arrays
roles = params[:roles].split(',') if params[:roles]
types = params[:types].split(',') if params[:types]
states = params[:states].split(',') if params[:states]
review_states = params[:reviewstates].split(',') if params[:reviewstates]
ids = params[:ids].split(',').map { |i| i.to_i } if params[:ids]
params.merge!({states: states, types: types, review_states: review_states, roles: roles, ids: ids})
params[:roles] = params[:roles].split(',') if params[:roles]
params[:types] = params[:types].split(',') if params[:types]
params[:states] = params[:states].split(',') if params[:states]
params[:review_states] = params[:reviewstates].split(',') if params[:reviewstates]
params[:ids] = params[:ids].split(',').map { |i| i.to_i } if params[:ids]

rel = BsRequest.collection(params).includes([:reviews]).
includes({bs_request_actions: :bs_request_action_accept_info}).
order('bs_requests.id').references(:bs_requests)
Expand Down

0 comments on commit 6ec5b64

Please sign in to comment.