# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1371329492 -7200
# Node ID 5ee341209d7f44b6e89de7a9418f342e08c273ec
# Parent  f60edcc45cfa2dc6c23107cabc9956ccdcd9b4a8
action logger will try to get IP address automatically based
on tmpl_context var (if defined)

diff -r f60edcc45cfa -r 5ee341209d7f rhodecode/lib/utils.py
--- 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: