kallithea Changeset - faaadfc3c359

Changeset - faaadfc3c359

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-04-24 17:36:09
marcin@python-works.com

fixed condition evaluated for gitrepo that returned null, simplified scm functions

2 files changed with 11 insertions and 14 deletions:

rhodecode/lib/base.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -59,12 +59,13 @@ class BaseRepoController(BaseController) @@
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:
             c.rhodecode_repo, dbrepo = self.scm_model.get(c.repo_name,
                                                           retval='repo')
             if c.rhodecode_repo:
             if c.rhodecode_repo is not None:
                 c.repository_followers = self.scm_model.get_followers(c.repo_name)
                 c.repository_forks = self.scm_model.get_forks(c.repo_name)
             else:
                 c.repository_followers = 0
                 c.repository_forks = 0

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -341,28 +341,24 @@ class ScmModel(BaseModel): @@
             .filter(UserFollowing.follows_user == u)\
             .filter(UserFollowing.user_id == user_id).scalar()
         return f is not None
     def get_followers(self, repo_id):
         if isinstance(repo_id, int):
             return self.sa.query(UserFollowing)\
                     .filter(UserFollowing.follows_repo_id == repo_id).count()
         else:
             return self.sa.query(UserFollowing)\
                     .filter(UserFollowing.follows_repository \
                             == RepoModel().get_by_repo_name(repo_id)).count()
         if not isinstance(repo_id, int):
             repo_id = getattr(Repository.by_repo_name(repo_id), 'repo_id')
         return self.sa.query(UserFollowing)\
                 .filter(UserFollowing.follows_repo_id == repo_id).count()
     def get_forks(self, repo_id):
         if isinstance(repo_id, int):
             return self.sa.query(Repository)\
         if not isinstance(repo_id, int):
             repo_id = getattr(Repository.by_repo_name(repo_id), 'repo_id')
         return self.sa.query(Repository)\
                 .filter(Repository.fork_id == repo_id).count()
         else:
             return self.sa.query(Repository)\
                 .filter(Repository.fork \
                         == RepoModel().get_by_repo_name(repo_id)).count()
     def pull_changes(self, repo_name, username):
         repo, dbrepo = self.get(repo_name, retval='all')
         try:
             extras = {'ip': '',

0 comments (0 inline, 0 general)