kallithea Changeset - 91ddd4db4614

Changeset - 91ddd4db4614

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2011-02-27 01:57:17
marcin@python-works.com

Added dedicated repo pager to support reversed new way slicing method of vcs and get_changesets method

4 files changed with 96 insertions and 10 deletions:

rhodecode/controllers/changelog.py

rhodecode/controllers/shortlog.py

rhodecode/controllers/summary.py

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -35,14 +35,13 @@ except ImportError: @@
 from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev
 from pylons import request, session, tmpl_context as c
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from webhelpers.paginate import Page
 from rhodecode.lib.helpers import RepoPage
 log = logging.getLogger(__name__)
 class ChangelogController(BaseRepoController):
     @LoginRequired()
@@ @@ -65,13 +64,13 @@ class ChangelogController(BaseRepoContro @@
             session.save()
         else:
             c.size = int(session.get('changelog_size', default))
         p = int(request.params.get('page', 1))
         c.total_cs = len(c.rhodecode_repo)
-        c.pagination = Page(c.rhodecode_repo, page=p, item_count=c.total_cs,
+        c.pagination = RepoPage(c.rhodecode_repo, page=p, item_count=c.total_cs,
                             items_per_page=c.size)
         self._graph(c.rhodecode_repo, c.size, p)
         return render('changelog/changelog.html')

rhodecode/controllers/shortlog.py

➞

Show inline comments

@@ @@ -26,29 +26,31 @@ @@
 # MA  02110-1301, USA.
 import logging
 from pylons import tmpl_context as c, request
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.helpers import RepoPage
 log = logging.getLogger(__name__)
 class ShortlogController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(ShortlogController, self).__before__()
     def index(self):
         p = int(request.params.get('page', 1))
-        c.repo_changesets = Page(c.rhodecode_repo, page=p, items_per_page=20)
+        c.repo_changesets = RepoPage(c.rhodecode_repo, page=p, items_per_page=20)
         c.shortlog_data = render('shortlog/shortlog_data.html')
         if request.params.get('partial'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -40,14 +40,13 @@ from rhodecode.model.db import Statistic @@
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import OrderedDict, EmptyChangeset
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib.tasks import get_commits_stats
 from webhelpers.paginate import Page
 from rhodecode.lib.helpers import RepoPage
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
@@ @@ -67,13 +66,13 @@ class SummaryController(BaseRepoControll @@
         c.following = self.scm_model.is_following_repo(c.repo_name,
                                              c.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=c.repo_name, **kw)
-        c.repo_changesets = Page(c.repo, page=1, items_per_page=10,
+        c.repo_changesets = RepoPage(c.repo, page=1, items_per_page=10,
                                  url=url_generator)
         e = request.environ
         if self.rhodecode_user.username == 'default':
             #for default(anonymous) user we don't need to pass credentials

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ from webhelpers.number import format_byt @@
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.pylonslib.secure_form import secure_form
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
+from webhelpers.paginate import Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """Reset button
     """
@@ @@ -572,12 +572,98 @@ def gravatar_url(email_address, size=30) @@
     # construct the url
     gravatar_url = baseurl + hashlib.md5(email_address.lower()).hexdigest() + "?"
     gravatar_url += urllib.urlencode({'d':default, 's':str(size)})
     return gravatar_url
 #==============================================================================
 # REPO PAGER
 #==============================================================================
 class RepoPage(Page):
     def __init__(self, collection, page=1, items_per_page=20,
         item_count=None, url=None, **kwargs):
         """Create a "RepoPage" instance. special pager for paging
         repository
         """
         self._url_generator = url
         # Safe the kwargs class-wide so they can be used in the pager() method
         self.kwargs = kwargs
         # Save a reference to the collection
         self.original_collection = collection
         self.collection = collection
         # The self.page is the number of the current page.
         # The first page has the number 1!
         try:
             self.page = int(page) # make it int() if we get it as a string
         except (ValueError, TypeError):
             self.page = 1
         self.items_per_page = items_per_page
         # Unless the user tells us how many items the collections has
         # we calculate that ourselves.
         if item_count is not None:
             self.item_count = item_count
         else:
             self.item_count = len(self.collection)
         # Compute the number of the first and last available page
         if self.item_count > 0:
             self.first_page = 1
             self.page_count = ((self.item_count - 1) / self.items_per_page) + 1
             self.last_page = self.first_page + self.page_count - 1
             # Make sure that the requested page number is the range of valid pages
             if self.page > self.last_page:
                 self.page = self.last_page
             elif self.page < self.first_page:
                 self.page = self.first_page
             # Note: the number of items on this page can be less than
             #       items_per_page if the last page is not full
             self.first_item = max(0, (self.item_count) - (self.page * items_per_page))
             self.last_item = ((self.item_count - 1) - items_per_page * (self.page - 1)) + 1
             iterator = self.collection.get_changesets(start=self.first_item,
                                                       end=self.last_item,
                                                       reverse=True)
             self.items = list(iterator)
             # Links to previous and next page
             if self.page > self.first_page:
                 self.previous_page = self.page - 1
             else:
                 self.previous_page = None
             if self.page < self.last_page:
                 self.next_page = self.page + 1
             else:
                 self.next_page = None
         # No items available
         else:
             self.first_page = None
             self.page_count = 0
             self.last_page = None
             self.first_item = None
             self.last_item = None
             self.previous_page = None
             self.next_page = None
             self.items = []
         # This is a subclass of the 'list' type. Initialise the list now.
         list.__init__(self, self.items)
 def safe_unicode(str):
     """safe unicode function. In case of UnicodeDecode error we try to return
     unicode with errors replace, if this failes we return unicode with
     string_escape decoding """
     try:

0 comments (0 inline, 0 general)