Mercurial > kallithea

comparison pylons_app/lib/middleware/simplehg.py @ 234:a0116e944da1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed naming convention for db modules.
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 27 May 2010 21:31:30 +0200
parents 58b46f9194c3
children 48727add84c9
comparison
equal deleted inserted replaced
233:08e0347351d0 234:a0116e944da1
16 from paste.auth.basic import AuthBasicAuthenticator 16 from paste.auth.basic import AuthBasicAuthenticator
17 from paste.httpheaders import REMOTE_USER, AUTH_TYPE 17 from paste.httpheaders import REMOTE_USER, AUTH_TYPE
18 from pylons_app.lib.auth import authfunc 18 from pylons_app.lib.auth import authfunc
19 from pylons_app.lib.utils import is_mercurial, make_ui, invalidate_cache 19 from pylons_app.lib.utils import is_mercurial, make_ui, invalidate_cache
20 from pylons_app.model import meta 20 from pylons_app.model import meta
21 from pylons_app.model.db import UserLogs, Users 21 from pylons_app.model.db import UserLog, User
22 from webob.exc import HTTPNotFound 22 from webob.exc import HTTPNotFound
23 import logging 23 import logging
24 import os 24 import os
25 log = logging.getLogger(__name__) 25 log = logging.getLogger(__name__)
26 26
100 return mapping[cmd] 100 return mapping[cmd]
101 101
102 def __log_user_action(self, username, action, repo): 102 def __log_user_action(self, username, action, repo):
103 sa = meta.Session 103 sa = meta.Session
104 try: 104 try:
105 user = sa.query(Users)\ 105 user = sa.query(User).filter(User.username == username).one()
106 .filter(Users.username == username).one() 106 user_log = UserLog()
107 user_log = UserLogs()
108 user_log.user_id = user.user_id 107 user_log.user_id = user.user_id
109 user_log.action = action 108 user_log.action = action
110 user_log.repository = repo.replace('/', '') 109 user_log.repository = repo.replace('/', '')
111 user_log.action_date = datetime.now() 110 user_log.action_date = datetime.now()
112 sa.add(user_log) 111 sa.add(user_log)