Mercurial > kallithea

changeset 1351:e0f670b987eb beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small cache fixes.
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 26 May 2011 01:48:29 +0200
parents eb489bf9d7c7
children 79041f2d16f4
files rhodecode/lib/base.py rhodecode/model/repo.py
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/base.py	Thu May 26 01:38:40 2011 +0200
+++ b/rhodecode/lib/base.py	Thu May 26 01:48:29 2011 +0200
@@ -62,7 +62,8 @@
         super(BaseRepoController, self).__before__()
         if c.repo_name:
 
-            c.rhodecode_repo, dbrepo = self.scm_model.get(c.repo_name, retval='repo')
+            c.rhodecode_repo, dbrepo = self.scm_model.get(c.repo_name,
+                                                          retval='repo')
 
             if c.rhodecode_repo is not None:
                 c.repository_followers = \
--- a/rhodecode/model/repo.py	Thu May 26 01:38:40 2011 +0200
+++ b/rhodecode/model/repo.py	Thu May 26 01:48:29 2011 +0200
@@ -74,6 +74,7 @@
         repo = self.sa.query(Repository)\
             .options(joinedload(Repository.fork))\
             .options(joinedload(Repository.user))\
+            .options(joinedload(Repository.group))\
             .filter(Repository.repo_name == repo_name)\
 
         if cache:
@@ -86,7 +87,7 @@
 
         #make transient for sake of errors
         make_transient(ret)
-        for k in ['fork', 'user']:
+        for k in ['fork', 'user', 'group']:
             attr = getattr(ret, k, False)
             if attr:
                 make_transient(attr)