Mercurial > kallithea
changeset 1106:5cbaeda8ec6f beta
fixed percentage indicator of build stats,added branch filter to changelog controller
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 01 Mar 2011 10:07:36 +0100 |
parents | 61c5f0ab24b9 |
children | 7bb902022d86 |
files | rhodecode/controllers/admin/repos.py rhodecode/controllers/changelog.py |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py Tue Mar 01 10:05:43 2011 +0100 +++ b/rhodecode/controllers/admin/repos.py Tue Mar 01 10:07:36 2011 +0100 @@ -158,7 +158,7 @@ last_rev = 0 c.stats_revision = last_rev repo, dbrepo = ScmModel().get(repo_name, retval='repo') - c.repo_last_rev = repo.count() if repo.revisions else 0 + c.repo_last_rev = repo.count() - 1 if repo.revisions else 0 c.default_user_id = User.by_username('default').user_id c.in_public_journal = self.sa.query(UserFollowing)\ @@ -350,7 +350,7 @@ last_rev = 0 c.stats_revision = last_rev - c.repo_last_rev = repo.count() if repo.revisions else 0 + c.repo_last_rev = repo.count() - 1 if repo.revisions else 0 if last_rev == 0 or c.repo_last_rev == 0: c.stats_percentage = 0
--- a/rhodecode/controllers/changelog.py Tue Mar 01 10:05:43 2011 +0100 +++ b/rhodecode/controllers/changelog.py Tue Mar 01 10:07:36 2011 +0100 @@ -66,9 +66,10 @@ c.size = int(session.get('changelog_size', default)) p = int(request.params.get('page', 1)) + branch_name = request.params.get('branch', None) c.total_cs = len(c.rhodecode_repo) c.pagination = RepoPage(c.rhodecode_repo, page=p, item_count=c.total_cs, - items_per_page=c.size) + items_per_page=c.size, branch_name=branch_name) self._graph(c.rhodecode_repo, c.size, p)