summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-01 16:32:30 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-03-01 16:32:30 +0000
commit80807a8c495da9ad54d2ab52db4b891d90c64f8f (patch)
treee1e7e0eee30d6ffe69061fff8f5bc54a2458977a /app
parentcaf61dc923cf351743610f5a6540ac8f534c1e05 (diff)
downloadredmine-80807a8c495da9ad54d2ab52db4b891d90c64f8f.tar.gz
redmine-80807a8c495da9ad54d2ab52db4b891d90c64f8f.zip
Add user's API key to /users/current.format (#8529).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11518 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/users/show.api.rsb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb
index de16f0681..7168cb94f 100644
--- a/app/views/users/show.api.rsb
+++ b/app/views/users/show.api.rsb
@@ -6,6 +6,7 @@ api.user do
api.mail @user.mail if User.current.admin? || !@user.pref.hide_mail
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)
render_api_custom_values @user.visible_custom_field_values, api