aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2010-05-24 00:58:26 +0200
committerMarcin Kuzminski <marcin@python-works.com>2010-05-24 00:58:26 +0200
commitddbe36cc7fe119ff4e3844c5be6c484f9074fb67 (patch)
tree834f21edcc9d17a2bcc4810efa795af522abe9dd
parentd1a17644fbd44777d3b9902e7472fff637d36d10 (diff)
version bump. Bugfix when changelog parameter was not an int. Added limit for 100 changelogs to view at once.v0.7.3
-rw-r--r--pylons_app/__init__.py2
-rw-r--r--pylons_app/controllers/changelog.py14
2 files changed, 10 insertions, 6 deletions
diff --git a/pylons_app/__init__.py b/pylons_app/__init__.py
index 28467212..39865f48 100644
--- a/pylons_app/__init__.py
+++ b/pylons_app/__init__.py
@@ -2,7 +2,7 @@
Hg app, a web based mercurial repository managment based on pylons
"""
-VERSION = (0, 7, 2, 'beta')
+VERSION = (0, 7, 3, 'beta')
__version__ = '.'.join((str(each) for each in VERSION[:4]))
diff --git a/pylons_app/controllers/changelog.py b/pylons_app/controllers/changelog.py
index 919fed23..5ac88cd9 100644
--- a/pylons_app/controllers/changelog.py
+++ b/pylons_app/controllers/changelog.py
@@ -1,4 +1,3 @@
-from beaker.cache import cache_region
from mercurial.graphmod import revisions as graph_rev, colored, CHANGESET
from mercurial.node import short
from pylons import request, response, session, tmpl_context as c, url, config, \
@@ -7,8 +6,6 @@ from pylons.controllers.util import abort, redirect
from pylons_app.lib.auth import LoginRequired
from pylons_app.lib.base import BaseController, render, _full_changelog_cached
from pylons_app.lib.filters import age as _age, person
-from pylons_app.lib.utils import get_repo_slug
-from pylons_app.model.hg_model import HgModel
from simplejson import dumps
from webhelpers.paginate import Page
import logging
@@ -22,11 +19,18 @@ class ChangelogController(BaseController):
def index(self):
if request.params.get('size'):
- c.size = int(request.params['size'])
+ limit = 100
+ default = 20
+ 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 = session.get('changelog_size', 20)
+ c.size = session.get('changelog_size', default)
changesets = _full_changelog_cached(c.repo_name)