From 1e71db421a83ed9db2ad30c3e2195f6c348467a7 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Thu, 25 Jan 2024 16:40:13 +0000 Subject: [PATCH] Adds user status to users list API (#38948). git-svn-id: https://svn.redmine.org/redmine/trunk@22637 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/users/index.api.rsb | 1 + test/integration/api_test/users_test.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/views/users/index.api.rsb b/app/views/users/index.api.rsb index b617ea91c..6ce38a58d 100644 --- a/app/views/users/index.api.rsb +++ b/app/views/users/index.api.rsb @@ -13,6 +13,7 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim api.passwd_changed_on user.passwd_changed_on api.avatar_url gravatar_url(user.mail, {rating: nil, size: nil, default: Setting.gravatar_default}) if Setting.gravatar_enabled? api.twofa_scheme user.twofa_scheme + api.status user.status render_api_custom_values user.visible_custom_field_values, api end diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb index 42cb5ce44..0342b3cdd 100644 --- a/test/integration/api_test/users_test.rb +++ b/test/integration/api_test/users_test.rb @@ -70,6 +70,7 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base json['users'].zip(users) do |user_json, user| assert_equal user.id, user_json['id'] assert_equal user.updated_on.iso8601, user_json['updated_on'] + assert_equal user.status, user_json['status'] # No one has changed password. assert_nil user_json['passwd_changed_on'] -- 2.39.5