Mercurial > kallithea
changeset 4001:5ee341209d7f
action logger will try to get IP address automatically based
on tmpl_context var (if defined)
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 15 Jun 2013 22:51:32 +0200 |
| parents | f60edcc45cfa |
| children | 5ee04157cadc |
| files | rhodecode/lib/utils.py |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/utils.py Wed Jun 12 21:57:11 2013 +0200 +++ b/rhodecode/lib/utils.py Sat Jun 15 22:51:32 2013 +0200 @@ -148,6 +148,11 @@ if not sa: sa = meta.Session() + # if we don't get explicit IP address try to get one from registered user + # in tmpl context var + from pylons import tmpl_context + if not ipaddr and hasattr(tmpl_context, 'rhodecode_user'): + ipaddr = tmpl_context.rhodecode_user.ip_addr try: if hasattr(user, 'user_id'): @@ -160,7 +165,7 @@ if hasattr(repo, 'repo_id'): repo_obj = Repository.get(repo.repo_id) repo_name = repo_obj.repo_name - elif isinstance(repo, basestring): + elif isinstance(repo, basestring): repo_name = repo.lstrip('/') repo_obj = Repository.get_by_repo_name(repo_name) else: