Mercurial > kallithea

comparison rhodecode/lib/utils.py @ 2375:bc2d8c03c050 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implemented #467 Journal logs comments on changesets - added created/updated user action to journal - added created/updated users group action journal - added ip adresses to most of action_log calls to track IP changes - rewrote action_parser to simpler and more efficient solution
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 03 Jun 2012 00:40:14 +0200
parents a3eb31cc4ab4
children 402a96fcfa22
comparison
equal deleted inserted replaced
2374:be2163ef127e 2375:bc2d8c03c050
144 repo_name = repo_obj.repo_name 144 repo_name = repo_obj.repo_name
145 elif isinstance(repo, basestring): 145 elif isinstance(repo, basestring):
146 repo_name = repo.lstrip('/') 146 repo_name = repo.lstrip('/')
147 repo_obj = Repository.get_by_repo_name(repo_name) 147 repo_obj = Repository.get_by_repo_name(repo_name)
148 else: 148 else:
149 raise Exception('You have to provide repository to action logger') 149 repo_obj = None
150 repo_name = ''
150 151
151 user_log = UserLog() 152 user_log = UserLog()
152 user_log.user_id = user_obj.user_id 153 user_log.user_id = user_obj.user_id
153 user_log.action = safe_unicode(action) 154 user_log.action = safe_unicode(action)
154 155
155 user_log.repository_id = repo_obj.repo_id 156 user_log.repository = repo_obj
156 user_log.repository_name = repo_name 157 user_log.repository_name = repo_name
157 158
158 user_log.action_date = datetime.datetime.now() 159 user_log.action_date = datetime.datetime.now()
159 user_log.user_ip = ipaddr 160 user_log.user_ip = ipaddr
160 sa.add(user_log) 161 sa.add(user_log)