Commit e749fbe6 authored by maeda's avatar maeda

Expose the Admin flag on the users api to admin users (#29459).

Patch by Holger Just.


git-svn-id: https://svn.redmine.org/redmine/trunk@17496 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 7b8c675f
......@@ -3,6 +3,7 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
api.user do
api.id user.id
api.login user.login
api.admin user.admin?
api.firstname user.firstname
api.lastname user.lastname
api.mail user.mail
......
api.user do
api.id @user.id
api.login @user.login if User.current.admin? || (User.current == @user)
api.admin @user.admin? if User.current.admin? || (User.current == @user)
api.firstname @user.firstname
api.lastname @user.lastname
api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail
......
......@@ -125,6 +125,18 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
assert_select 'user status', :text => User.find(1).status.to_s
end
test "GET /users/:id should return admin status for current user" do
get '/users/2.xml', :headers => credentials('jsmith')
assert_response :success
assert_select 'user admin', :text => 'false'
end
test "GET /users/:id should not return admin status for other user" do
get '/users/3.xml', :headers => credentials('jsmith')
assert_response :success
assert_select 'user admin', 0
end
test "POST /users.xml with valid parameters should create the user" do
assert_difference('User.count') do
post '/users.xml',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment