Mercurial > kallithea

changeset 1040:8e49b6ceffe1 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes fixes fixes ! optimized queries on journal added some logging, fixed found bugs due to previous refactorings
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 13 Feb 2011 02:48:02 +0100
parents 51b70569c330
children 98be43b888c4
files rhodecode/controllers/admin/admin.py rhodecode/lib/auth.py rhodecode/lib/helpers.py
diffstat 3 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/admin.py	Sun Feb 13 01:38:39 2011 +0100
+++ b/rhodecode/controllers/admin/admin.py	Sun Feb 13 02:48:02 2011 +0100
@@ -26,11 +26,14 @@
 # MA  02110-1301, USA.
 
 import logging
+
 from pylons import request, tmpl_context as c
+from sqlalchemy.orm import joinedload
+from webhelpers.paginate import Page
+
+from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import UserLog
-from webhelpers.paginate import Page
-from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 
 log = logging.getLogger(__name__)
 
@@ -43,7 +46,11 @@
     @HasPermissionAllDecorator('hg.admin')
     def index(self):
 
-        users_log = self.sa.query(UserLog).order_by(UserLog.action_date.desc())
+        users_log = self.sa.query(UserLog)\
+                .options(joinedload(UserLog.user))\
+                .options(joinedload(UserLog.repository))\
+                .order_by(UserLog.action_date.desc())
+
         p = int(request.params.get('page', 1))
         c.users_log = Page(users_log, page=p, items_per_page=10)
         c.log_data = render('admin/admin_log.html')
--- a/rhodecode/lib/auth.py	Sun Feb 13 01:38:39 2011 +0100
+++ b/rhodecode/lib/auth.py	Sun Feb 13 02:48:02 2011 +0100
@@ -600,7 +600,7 @@
 
     def check_permissions(self):
         log.debug('checking mercurial protocol '
-                  'permissions for user:%s repository:%s',
+                  'permissions %s for user:%s repository:%s', self.user_perms,
                                                 self.username, self.repo_name)
         if self.required_perms.intersection(self.user_perms):
             log.debug('permission granted')
--- a/rhodecode/lib/helpers.py	Sun Feb 13 01:38:39 2011 +0100
+++ b/rhodecode/lib/helpers.py	Sun Feb 13 02:48:02 2011 +0100
@@ -441,9 +441,8 @@
         revs = action_params.split(',')
         repo_name = user_log.repository.repo_name
         from rhodecode.model.scm import ScmModel
-
-        message = lambda rev: get_changeset_safe(ScmModel().get(repo_name),
-                                                 rev).message
+        repo, dbrepo = ScmModel().get(repo_name, retval='repo')
+        message = lambda rev: get_changeset_safe(repo, rev).message
 
         cs_links = " " + ', '.join ([link_to(rev,
                 url('changeset_home',