Mercurial > kallithea

comparison rhodecode/controllers/admin/admin.py @ 2776:63e58ef80ef1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge beta branch into stable
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 02 Sep 2012 21:19:54 +0200
parents 82a88013a3fd 91c442a489bb
children d998cc84cf72
comparison
equal deleted inserted replaced
2301:9d097c2592d3 2776:63e58ef80ef1
43 super(AdminController, self).__before__() 43 super(AdminController, self).__before__()
44 44
45 @HasPermissionAllDecorator('hg.admin') 45 @HasPermissionAllDecorator('hg.admin')
46 def index(self): 46 def index(self):
47 47
48 users_log = self.sa.query(UserLog)\ 48 users_log = UserLog.query()\
49 .options(joinedload(UserLog.user))\ 49 .options(joinedload(UserLog.user))\
50 .options(joinedload(UserLog.repository))\ 50 .options(joinedload(UserLog.repository))\
51 .order_by(UserLog.action_date.desc()) 51 .order_by(UserLog.action_date.desc())
52 52
53 p = int(request.params.get('page', 1)) 53 p = int(request.params.get('page', 1))