Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 16:26:03 +01:00
Code Issues Packages Projects Releases Activity

Adds user status to users list API (#38948).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22637 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2024-01-25 16:40:13 +00:00
parent 479c54bf1d
commit 1e71db421a
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/users/index.api.rsb
View File

@@ -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.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.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.twofa_scheme user.twofa_scheme
api.status user.status
render_api_custom_values user.visible_custom_field_values, api render_api_custom_values user.visible_custom_field_values, api
end end

1
test/integration/api_test/users_test.rb
View File

@@ -70,6 +70,7 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
json['users'].zip(users) do |user_json, user| json['users'].zip(users) do |user_json, user|
assert_equal user.id, user_json['id'] assert_equal user.id, user_json['id']
assert_equal user.updated_on.iso8601, user_json['updated_on'] assert_equal user.updated_on.iso8601, user_json['updated_on']
assert_equal user.status, user_json['status']
# No one has changed password. # No one has changed password.
assert_nil user_json['passwd_changed_on'] assert_nil user_json['passwd_changed_on']