Mercurial > kallithea
changeset 3455:d5ae996eed11 beta
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 05 Mar 2013 11:39:30 +0100 |
parents | 867c4d7fd2d8 |
children | cf1fbc9fed89 |
files | rhodecode/controllers/admin/settings.py rhodecode/templates/admin/users/user_edit.html rhodecode/templates/admin/users/user_edit_my_account_form.html |
diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py Mon Mar 04 19:23:43 2013 +0100 +++ b/rhodecode/controllers/admin/settings.py Tue Mar 05 11:39:30 2013 +0100 @@ -38,7 +38,7 @@ from rhodecode.lib import helpers as h from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ HasPermissionAnyDecorator, NotAnonymous, HasPermissionAny,\ - HasReposGroupPermissionAll, HasReposGroupPermissionAny + HasReposGroupPermissionAll, HasReposGroupPermissionAny, AuthUser from rhodecode.lib.base import BaseController, render from rhodecode.lib.celerylib import tasks, run_task from rhodecode.lib.utils import repo2db_mapper, invalidate_cache, \ @@ -409,6 +409,8 @@ # url('admin_settings_my_account') c.user = User.get(self.rhodecode_user.user_id) + c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id, + ip_addr=self.ip_addr) c.ldap_dn = c.user.ldap_dn if c.user.username == 'default': @@ -440,6 +442,8 @@ # url('admin_settings_my_account_update', id=ID) uid = self.rhodecode_user.user_id c.user = User.get(self.rhodecode_user.user_id) + c.perm_user = AuthUser(user_id=self.rhodecode_user.user_id, + ip_addr=self.ip_addr) c.ldap_dn = c.user.ldap_dn email = self.rhodecode_user.email _form = UserForm(edit=True,
--- a/rhodecode/templates/admin/users/user_edit.html Mon Mar 04 19:23:43 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit.html Tue Mar 05 11:39:30 2013 +0100 @@ -43,11 +43,14 @@ <label>${_('API key')}:</label> ${c.user.api_key} </div> </div> + ##show current ip just if we show ourself + %if c.rhodecode_user.username == c.user.username: <div class="field"> <div class="label"> <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"} </div> </div> + %endif <div class="fields"> <div class="field"> <div class="label">
--- a/rhodecode/templates/admin/users/user_edit_my_account_form.html Mon Mar 04 19:23:43 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit_my_account_form.html Tue Mar 05 11:39:30 2013 +0100 @@ -20,6 +20,11 @@ <label>${_('API key')}</label> ${c.user.api_key} </div> </div> + <div class="field"> + <div class="label"> + <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"} + </div> + </div> <div class="fields"> <div class="field"> <div class="label">