Remove deprecated @status=@ param used to get all users. @status=*@ should be used...

git-svn-id: https://svn.redmine.org/redmine/trunk@22635 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f512f93f84cf59452af6e67a8e860f6e1fd2200b..e8f5aa0f7095279fa41c3b2879bf594c9ad19a4a 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -47,10 +47,6 @@ class UsersController < ApplicationController
 
     # API backwards compatibility: handle legacy filter parameters
     unless request.format.html?
-      if params.include?(:status) && params[:status].blank?
-        ActiveSupport::Deprecation.warn "Getting all users from API using an empty status param (status=) is deprecated and it will be removed in Redmine 6.0. Please use \"status=*\"."
-        @query.add_filter 'status', '*'
-      end
       if name = params[:name].presence
         @query.add_filter 'name', '~', [name]
       end

diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index 2020b16441b6f4df3e77838de882f14a66393770..e2799f8290e5c43c1cfcb94883302fa04e2b1c12 100644 (file)
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -97,13 +97,6 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
     users = User.logged
     assert_equal users.size, json['users'].size
 
-    get '/users.json', headers: credentials('admin'), params: { status: ''}
-    assert_response :success
-    json = ActiveSupport::JSON.decode(response.body)
-    assert json.key?('users')
-    users = User.logged
-    assert_equal users.size, json['users'].size
-
     get '/users.json', headers: credentials('admin'), params: { name: 'jsmith' }
     assert_response :success
     json = ActiveSupport::JSON.decode(response.body)