Mercurial > kallithea
diff rhodecode/controllers/admin/admin.py @ 2776:63e58ef80ef1
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 |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/admin.py Sat May 19 14:54:50 2012 +0200 +++ b/rhodecode/controllers/admin/admin.py Sun Sep 02 21:19:54 2012 +0200 @@ -45,7 +45,7 @@ @HasPermissionAllDecorator('hg.admin') def index(self): - users_log = self.sa.query(UserLog)\ + users_log = UserLog.query()\ .options(joinedload(UserLog.user))\ .options(joinedload(UserLog.repository))\ .order_by(UserLog.action_date.desc())