comparison app/views/users/show.api.rsb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 api.user do 1 api.user do
2 api.id @user.id 2 api.id @user.id
3 api.login @user.login if User.current.admin? 3 api.login @user.login if User.current.admin? || (User.current == @user)
4 api.firstname @user.firstname 4 api.firstname @user.firstname
5 api.lastname @user.lastname 5 api.lastname @user.lastname
6 api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail 6 api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail
7 api.created_on @user.created_on 7 api.created_on @user.created_on
8 api.last_login_on @user.last_login_on 8 api.last_login_on @user.last_login_on
9 api.api_key @user.api_key if User.current.admin? || (User.current == @user)
9 10
10 render_api_custom_values @user.visible_custom_field_values, api 11 render_api_custom_values @user.visible_custom_field_values, api
11 12
12 api.array :groups do |groups| 13 api.array :groups do |groups|
13 @user.groups.each do |group| 14 @user.groups.each do |group|