kallithea Changeset - 5cbaeda8ec6f

Changeset - 5cbaeda8ec6f

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-03-01 10:07:36
marcin@python-works.com

fixed percentage indicator of build stats,added branch filter to changelog controller

2 files changed with 4 insertions and 3 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/changelog.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -149,25 +149,25 @@ class ReposController(BaseController): @@
             action_logger(self.rhodecode_user, 'admin_updated_repo',
                               changed_name, '', self.sa)
         except formencode.Invalid, errors:
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             if c.repo_info.stats:
                 last_rev = c.repo_info.stats.stat_on_revision
             else:
                 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)\
                 .filter(UserFollowing.user_id == c.default_user_id)\
                 .filter(UserFollowing.follows_repository == c.repo_info).scalar()
             if last_rev == 0:
                 c.stats_percentage = 0
             else:
                 c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                                 c.repo_last_rev) * 100)
@@ @@ -341,25 +341,25 @@ class ReposController(BaseController): @@
         c.default_user_id = User.by_username('default').user_id
         c.in_public_journal = self.sa.query(UserFollowing)\
             .filter(UserFollowing.user_id == c.default_user_id)\
             .filter(UserFollowing.follows_repository == c.repo_info).scalar()
         if c.repo_info.stats:
             last_rev = c.repo_info.stats.stat_on_revision
         else:
             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
         else:
             c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                             c.repo_last_rev) * 100)
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
         defaults = c.repo_info.get_dict()

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -57,27 +57,28 @@ class ChangelogController(BaseRepoContro @@
             try:
                 int_size = int(request.params.get('size'))
             except ValueError:
                 int_size = default
             int_size = int_size if int_size <= limit else limit
             c.size = int_size
             session['changelog_size'] = c.size
             session.save()
         else:
             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)
         return render('changelog/changelog.html')
     def _graph(self, repo, size, p):
         """
         Generates a DAG graph for mercurial
         :param repo: repo instance
         :param size: number of commits to show

0 comments (0 inline, 0 general)