Merge pull request #2354 from Ana06/merge

[api] Merge! is deprecated
openSUSE · Nov 23, 2016 · 7cadf70 · 7cadf70
2 parents 6255d37 + c7397b9
commit 7cadf70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/api/app/controllers/request_controller.rb b/src/api/app/controllers/request_controller.rb
@@ -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)

diff --git a/src/api/test/unit/code_quality_test.rb b/src/api/test/unit/code_quality_test.rb
@@ -90,7 +90,7 @@ def setup
       'Flag#compute_status'                                                     => 145.55,
       'PublicController#binary_packages'                                        => 126.16,
       'Repository#cleanup_before_destroy'                                       => 82.98,
-      'RequestController#render_request_collection'                             => 82.38,
+      'RequestController#render_request_collection'                             => 85.91,
       'SearchController#find_attribute'                                         => 97.33,
       'SearchController#search'                                                 => 81.15,
       'SourceController#project_command_copy'                                   => 140.04,