diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb index 7168cb94f..e4c49f9b8 100644 --- a/app/views/users/show.api.rsb +++ b/app/views/users/show.api.rsb @@ -7,6 +7,7 @@ api.user do api.created_on @user.created_on api.last_login_on @user.last_login_on api.api_key @user.api_key if User.current.admin? || (User.current == @user) + api.status @user.status if User.current.admin? render_api_custom_values @user.visible_custom_field_values, api diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb index 7f72872a2..f90e8cb3d 100644 --- a/test/integration/api_test/users_test.rb +++ b/test/integration/api_test/users_test.rb @@ -120,6 +120,18 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base assert_tag 'user', :child => {:tag => 'api_key', :content => User.find(2).api_key} end + test "GET /users/:id should not return status for standard user" do + get '/users/3.xml', {}, credentials('jsmith') + assert_response :success + assert_no_tag 'user', :child => {:tag => 'status'} + end + + test "GET /users/:id should return status for administrators" do + get '/users/2.xml', {}, credentials('admin') + assert_response :success + assert_tag 'user', :child => {:tag => 'status', :content => User.find(1).status.to_s} + end + context "POST /users" do context "with valid parameters" do setup do