mirror of
https://github.com/meineerde/redmine.git
synced 2025-10-17 17:01:01 +00:00
Display user logins on profiles (#26127).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17721 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
fe28726253
commit
039580b73d
@ -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? || (User.current == @user)
|
api.login @user.login
|
||||||
api.admin @user.admin? if User.current.admin? || (User.current == @user)
|
api.admin @user.admin? if User.current.admin? || (User.current == @user)
|
||||||
api.firstname @user.firstname
|
api.firstname @user.firstname
|
||||||
api.lastname @user.lastname
|
api.lastname @user.lastname
|
||||||
@ -29,7 +29,7 @@ api.user do
|
|||||||
attrs = {:id => member_role.role.id, :name => member_role.role.name}
|
attrs = {:id => member_role.role.id, :name => member_role.role.name}
|
||||||
attrs.merge!(:inherited => true) if member_role.inherited_from.present?
|
attrs.merge!(:inherited => true) if member_role.inherited_from.present?
|
||||||
api.role attrs
|
api.role attrs
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end if membership.project
|
end if membership.project
|
||||||
|
|||||||
@ -6,9 +6,7 @@
|
|||||||
|
|
||||||
<div class="splitcontentleft">
|
<div class="splitcontentleft">
|
||||||
<ul>
|
<ul>
|
||||||
<% if User.current.admin? %>
|
<li><%=l(:field_login)%>: <%= @user.login %></li>
|
||||||
<li><%=l(:field_login)%>: <%= @user.login %></li>
|
|
||||||
<% end %>
|
|
||||||
<% unless @user.pref.hide_mail %>
|
<% unless @user.pref.hide_mail %>
|
||||||
<li><%=l(:field_mail)%>: <%= mail_to(@user.mail, nil, :encode => 'javascript') %></li>
|
<li><%=l(:field_mail)%>: <%= mail_to(@user.mail, nil, :encode => 'javascript') %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@ -89,16 +89,10 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
|
|||||||
assert_select 'user id', :text => '2'
|
assert_select 'user id', :text => '2'
|
||||||
end
|
end
|
||||||
|
|
||||||
test "GET /users/:id should not return login for other user" do
|
test "GET /users/:id should return login for visible user" do
|
||||||
get '/users/3.xml', :headers => credentials('jsmith')
|
get '/users/3.xml', :headers => credentials('jsmith')
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_select 'user login', 0
|
assert_select 'user login', :text => 'dlopper'
|
||||||
end
|
|
||||||
|
|
||||||
test "GET /users/:id should return login for current user" do
|
|
||||||
get '/users/2.xml', :headers => credentials('jsmith')
|
|
||||||
assert_response :success
|
|
||||||
assert_select 'user login', :text => 'jsmith'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "GET /users/:id should not return api_key for other user" do
|
test "GET /users/:id should not return api_key for other user" do
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user