From 5676499cebf5246a895a8d79d947ca62f7e5fbd8 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Thu, 25 Jan 2024 15:38:39 +0000 Subject: [PATCH] Remove deprecated @status=@ param used to get all users. @status=*@ should be used now. (#40124). git-svn-id: https://svn.redmine.org/redmine/trunk@22635 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/users_controller.rb | 4 ---- test/integration/api_test/users_test.rb | 7 ------- 2 files changed, 11 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f512f93f8..e8f5aa0f7 100644 --- 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 2020b1644..e2799f829 100644 --- 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)