kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add login to /users/:id API for current user (#13155).

Browse Source 
Patch by Jérôme Bataille.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11437 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-02-18 17:24:54 +00:00
parent 661dd6dcf5
commit 504116bfca
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/users/show.api.rsb
View File

@ -1,6 +1,6 @@
api.user do api.user do
api.id @user.id api.id @user.id
api.login @user.login if User.current.admin? api.login @user.login if User.current.admin? || (User.current == @user)
api.firstname @user.firstname api.firstname @user.firstname
api.lastname @user.lastname api.lastname @user.lastname
api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail

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

@ -96,6 +96,18 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
end end
end end
test "GET /users/:id should not return login for other user" do
get '/users/3.xml', {}, credentials('jsmith')
assert_response :success
assert_no_tag 'user', :child => {:tag => 'login'}
end
test "GET /users/:id should return login for current user" do
get '/users/2.xml', {}, credentials('jsmith')
assert_response :success
assert_tag 'user', :child => {:tag => 'login', :content => 'jsmith'}
end
context "POST /users" do context "POST /users" do
context "with valid parameters" do context "with valid parameters" do
setup do setup do