You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/11/19 23:59:40 UTC
[01/10] allura git commit: [#7794] ticket:686 Use page size pref on
tracker main page
Repository: allura
Updated Branches:
refs/heads/master f2baa55c7 -> f66f754ee
[#7794] ticket:686 Use page size pref on tracker main page
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a756521d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a756521d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a756521d
Branch: refs/heads/master
Commit: a756521d78d7eb83944bee2e023505ccc48a1694
Parents: f828804
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Nov 18 11:50:23 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a756521d/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 9cc3596..b38bf1d 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -641,7 +641,7 @@ class RootController(BaseController, FeedController):
@expose('jinja:forgetracker:templates/tracker/index.html')
@validate(dict(deleted=validators.StringBool(if_empty=False),
filter=V.JsonConverter(if_empty={})))
- def index(self, limit=25, columns=None, page=0, sort='ticket_num desc', deleted=False, filter=None, **kw):
+ def index(self, limit=None, columns=None, page=0, sort='ticket_num desc', deleted=False, filter=None, **kw):
show_deleted = [False]
if deleted and has_access(c.app, 'delete'):
show_deleted = [False, True]
@@ -652,7 +652,7 @@ class RootController(BaseController, FeedController):
c.app.globals.not_closed_mongo_query,
c.app.globals.not_closed_query,
filter,
- sort=sort, limit=int(limit), page=page,
+ sort=sort, limit=limit, page=page,
deleted={'$in': show_deleted},
show_deleted=deleted, **kw)
[09/10] allura git commit: [#7794] ticket:686 Set default page size
to 25
Posted by br...@apache.org.
[#7794] ticket:686 Set default page size to 25
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c0841459
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c0841459
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c0841459
Branch: refs/heads/master
Commit: c0841459d527bfc063ebd474610ea070db42c721
Parents: a756521
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Nov 18 11:57:02 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:33 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c0841459/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 0564f75..8435f0f 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -380,13 +380,13 @@ class Globals(object):
def credentials(self):
return Credentials.get()
- def handle_paging(self, limit, page, default=50):
+ def handle_paging(self, limit, page, default=25):
limit = self.manage_paging_preference(limit, default)
page = max(int(page), 0)
start = page * int(limit)
return (limit, page, start)
- def manage_paging_preference(self, limit, default=50):
+ def manage_paging_preference(self, limit, default=25):
if not limit:
if c.user in (None, M.User.anonymous()):
limit = default
[05/10] allura git commit: [#7794] ticket:677 Fix test
Posted by br...@apache.org.
[#7794] ticket:677 Fix test
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f8288040
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f8288040
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f8288040
Branch: refs/heads/master
Commit: f828804075996e7d0f49af595f7b1a323a6b380f
Parents: 95fef54
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Nov 14 08:57:26 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f8288040/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 34b71c9..cab95eb 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -485,7 +485,7 @@ class TestForum(TestController):
r = self.app.get('/discussion/testforum/moderate/')
post = FM.ForumPost.query.get(text='Post content')
link = '<a href="%s">[%s]</a>' % (post.thread.url()
- + '?limit=25#' + post.slug, post.shorthand_id())
+ + '?limit=50#' + post.slug, post.shorthand_id())
assert link in r, link
def test_thread(self):
[04/10] allura git commit: [#7794] ticket:677 Always use user prefs
for page size
Posted by br...@apache.org.
[#7794] ticket:677 Always use user prefs for page size
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7b1769f3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7b1769f3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7b1769f3
Branch: refs/heads/master
Commit: 7b1769f3b1d414cd4653c84d7abf14a008ffa8e9
Parents: bcd41c9
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Nov 14 07:45:49 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7b1769f3/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 2d5136e..ac8bcdb 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -387,19 +387,9 @@ class Globals(object):
return (limit, page, start)
def manage_paging_preference(self, limit, default=50):
- if limit:
+ if not limit:
if c.user in (None, M.User.anonymous()):
- session['results_per_page'] = int(limit)
- session.save()
- else:
- c.user.set_pref('results_per_page', int(limit))
- else:
- if c.user in (None, M.User.anonymous()):
- try:
- limit = session['results_per_page']
- # TypeError if no session registered for thread
- except (KeyError, TypeError):
- limit = default
+ limit = default
else:
limit = c.user.get_pref('results_per_page') or default
return limit
[08/10] allura git commit: [#7794] ticket:686 Fix tests failing due
to new default limit
Posted by br...@apache.org.
[#7794] ticket:686 Fix tests failing due to new default limit
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f66f754e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f66f754e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f66f754e
Branch: refs/heads/master
Commit: f66f754eeb30e5b881998bc02e1f9a47d77adb5b
Parents: 65b7d9f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Nov 19 13:47:23 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:33 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/model/test_discussion.py | 4 ++--
Allura/allura/tests/test_globals.py | 6 +++---
ForgeTracker/forgetracker/tests/functional/test_root.py | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f66f754e/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index f814fad..1768777 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -365,7 +365,7 @@ def test_post_url_paginated():
# with default paging limit
for _p in p:
- url = t.url() + '?limit=50#' + _p.slug
+ url = t.url() + '?limit=25#' + _p.slug
assert _p.url_paginated() == url, _p.url_paginated()
# with user paging limit
@@ -387,7 +387,7 @@ def test_post_url_paginated_with_artifact():
page = Page.upsert(title='Test Page')
thread = page.discussion_thread
comment = thread.post('Comment')
- url = page.url() + '?limit=50#' + comment.slug
+ url = page.url() + '?limit=25#' + comment.slug
assert_equals(comment.url_paginated(), url)
http://git-wip-us.apache.org/repos/asf/allura/blob/f66f754e/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 85eeb37..dd4e7e6 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -748,9 +748,9 @@ class TestHandlePaging(unittest.TestCase):
self.assertEqual(c.user.get_pref('results_per_page'), None)
def test_without_limit(self):
- # default limit = 50
- self.assertEqual(g.handle_paging(None, 0), (50, 0, 0))
- self.assertEqual(g.handle_paging(None, 2), (50, 2, 100))
+ # default limit = 25
+ self.assertEqual(g.handle_paging(None, 0), (25, 0, 0))
+ self.assertEqual(g.handle_paging(None, 2), (25, 2, 50))
# handle paging must not mess up user preferences
self.assertEqual(c.user.get_pref('results_per_page'), None)
http://git-wip-us.apache.org/repos/asf/allura/blob/f66f754e/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index b882680..8506d3a 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1444,7 +1444,7 @@ class TestFunctionalController(TrackerTestController):
headers={'Referer': '/bugs/1/'.encode("utf-8")})
r = self.app.get('/bugs/feed.rss')
post = M.Post.query.find().first()
- assert '/p/test/bugs/1/?limit=50#' + post.slug in r
+ assert '/p/test/bugs/1/?limit=25#' + post.slug in r
r = self.app.get('/bugs/1/')
post_link = str(
r.html.find('div', {'class': 'edit_post_form reply'}).find('form')['action'])
@@ -2042,7 +2042,7 @@ class TestFunctionalController(TrackerTestController):
'app_config_id': ac_id,
'ticket_num': 1}).first()
post = ticket.discussion_thread.last_post
- ticket_link = '/p/test2/bugs2/1/?limit=50#' + post.slug
+ ticket_link = '/p/test2/bugs2/1/?limit=25#' + post.slug
msg = 'Ticket moved from /p/test/bugs/1/'
assert_equal(post.text, msg)
# auto comment content and link to it should be in a ticket's feed
@@ -2075,7 +2075,7 @@ class TestFunctionalController(TrackerTestController):
assert_equal(comments_cnt, 2) # moved auto comment + new comment
post = ticket.discussion_thread.last_post
# content and link to the ticket should be in a tracker's feed
- ticket_link = '/p/test2/bugs2/1/?limit=50#' + post.slug
+ ticket_link = '/p/test2/bugs2/1/?limit=25#' + post.slug
r = self.app.get('/p/test2/bugs2/feed')
assert post_content in r, r
assert ticket_link in r, r
[02/10] allura git commit: [#7794] ticket:677 Always cast limit to int
Posted by br...@apache.org.
[#7794] ticket:677 Always cast limit to int
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/95fef546
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/95fef546
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/95fef546
Branch: refs/heads/master
Commit: 95fef546dc532c6cd7b83acb8fe96480aaae4874
Parents: fa8a9e4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Nov 14 08:55:49 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/app_globals.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/95fef546/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index ac8bcdb..0564f75 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -392,7 +392,7 @@ class Globals(object):
limit = default
else:
limit = c.user.get_pref('results_per_page') or default
- return limit
+ return int(limit)
def document_class(self, neighborhood):
classes = ''
[06/10] allura git commit: [#7794] ticket:677 Add tests for
g.handle_paging
Posted by br...@apache.org.
[#7794] ticket:677 Add tests for g.handle_paging
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/bcd41c9c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bcd41c9c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bcd41c9c
Branch: refs/heads/master
Commit: bcd41c9c99059f95adf9e891c4ab5e0001d57658
Parents: f2baa55
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Nov 10 13:26:31 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/test_globals.py | 50 +++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/bcd41c9c/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 5dc0e43..85eeb37 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -23,7 +23,7 @@ import os
import allura
import unittest
import hashlib
-from mock import patch
+from mock import patch, Mock
from bson import ObjectId
from nose.tools import with_setup, assert_equal, assert_in, assert_not_in
@@ -726,3 +726,51 @@ class TestCachedMarkdown(unittest.TestCase):
self.assertIsNone(self.post.text_cache.md5)
self.assertIsNone(self.post.text_cache.html)
self.assertIsNone(self.post.text_cache.render_time)
+
+
+
+class TestHandlePaging(unittest.TestCase):
+
+ def setUp(self):
+ prefs = {}
+ c.user = Mock()
+ def get_pref(name):
+ return prefs.get(name)
+ def set_pref(name, value):
+ prefs[name] = value
+ c.user.get_pref = get_pref
+ c.user.set_pref = set_pref
+
+ def test_with_limit(self):
+ self.assertEqual(g.handle_paging(10, 0), (10, 0, 0))
+ self.assertEqual(g.handle_paging(10, 2), (10, 2, 20))
+ # handle paging must not mess up user preferences
+ self.assertEqual(c.user.get_pref('results_per_page'), None)
+
+ def test_without_limit(self):
+ # default limit = 50
+ self.assertEqual(g.handle_paging(None, 0), (50, 0, 0))
+ self.assertEqual(g.handle_paging(None, 2), (50, 2, 100))
+ # handle paging must not mess up user preferences
+ self.assertEqual(c.user.get_pref('results_per_page'), None)
+
+ # user has page size preference
+ c.user.set_pref('results_per_page', 100)
+ self.assertEqual(g.handle_paging(None, 0), (100, 0, 0))
+ self.assertEqual(g.handle_paging(None, 2), (100, 2, 200))
+ # handle paging must not mess up user preferences
+ self.assertEqual(c.user.get_pref('results_per_page'), 100)
+
+ def test_without_limit_with_default(self):
+ # default limit is not used when explicitly provided
+ self.assertEqual(g.handle_paging(None, 0, 30), (30, 0, 0))
+ self.assertEqual(g.handle_paging(None, 2, 30), (30, 2, 60))
+ # handle paging must not mess up user preferences
+ self.assertEqual(c.user.get_pref('results_per_page'), None)
+
+ # user has page size preference, which is not affected by default
+ c.user.set_pref('results_per_page', 25)
+ self.assertEqual(g.handle_paging(None, 0, 30), (25, 0, 0))
+ self.assertEqual(g.handle_paging(None, 2, 30), (25, 2, 50))
+ # handle paging must not mess up user preferences
+ self.assertEqual(c.user.get_pref('results_per_page'), 25)
[03/10] allura git commit: [#7794] ticket:677 Add handle_paging calls
where only sanitizer is used
Posted by br...@apache.org.
[#7794] ticket:677 Add handle_paging calls where only sanitizer is used
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/fa8a9e48
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/fa8a9e48
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/fa8a9e48
Branch: refs/heads/master
Commit: fa8a9e487310524c40937716c0649e7915a30339
Parents: 5eb6734
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Nov 14 08:26:51 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
ForgeBlog/forgeblog/main.py | 11 +++++++----
ForgeTracker/forgetracker/tracker_main.py | 5 +++--
ForgeWiki/forgewiki/wiki_main.py | 7 ++++---
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/fa8a9e48/ForgeBlog/forgeblog/main.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 9e70769..1e3f604 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -25,6 +25,7 @@ import pymongo
from tg import config, expose, validate, redirect, flash, jsonify
from tg.decorators import with_trailing_slash, without_trailing_slash
from pylons import tmpl_context as c
+from pylons import app_globals as g
from pylons import request
from paste.deploy.converters import asbool
import formencode
@@ -213,13 +214,14 @@ class RootController(BaseController, FeedController):
@expose('jinja:forgeblog:templates/blog/index.html')
@with_trailing_slash
@validate(dict(page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=25, if_invalid=25)))
- def index(self, page=0, limit=10, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, page=0, limit=None, **kw):
query_filter = dict(app_config_id=c.app.config._id)
if not has_access(c.app, 'write')():
query_filter['state'] = 'published'
q = BM.BlogPost.query.find(query_filter)
post_count = q.count()
+ limit, page, _ = g.handle_paging(limit, page)
limit, page = h.paging_sanitizer(limit, page, post_count)
posts = q.sort('timestamp', pymongo.DESCENDING) \
.skip(page * limit).limit(limit)
@@ -295,14 +297,15 @@ class PostController(BaseController, FeedController):
@expose('jinja:forgeblog:templates/blog/post.html')
@with_trailing_slash
@validate(dict(page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=25, if_invalid=25)))
- def index(self, page=0, limit=25, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, page=0, limit=None, **kw):
if self.post.state == 'draft':
require_access(self.post, 'write')
c.form = W.view_post_form
c.subscribe_form = W.subscribe_form
c.thread = W.thread
post_count = self.post.discussion_thread.post_count
+ limit, page, _ = g.handle_paging(limit, page)
limit, page = h.paging_sanitizer(limit, page, post_count)
version = kw.pop('version', None)
post = self._get_version(version)
http://git-wip-us.apache.org/repos/asf/allura/blob/fa8a9e48/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index fd8917e..9cc3596 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1287,8 +1287,8 @@ class TicketController(BaseController, FeedController):
@expose('jinja:forgetracker:templates/tracker/ticket.html')
@validate(dict(
page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=10, if_invalid=10)))
- def index(self, page=0, limit=10, deleted=False, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, page=0, limit=None, deleted=False, **kw):
ticket_visible = self.ticket and not self.ticket.deleted
if ticket_visible or has_access(self.ticket, 'delete'):
c.ticket_form = W.ticket_form
@@ -1303,6 +1303,7 @@ class TicketController(BaseController, FeedController):
else:
subscribed = M.Mailbox.subscribed(artifact=self.ticket)
post_count = self.ticket.discussion_thread.post_count
+ limit, page, _ = g.handle_paging(limit, page)
limit, page = h.paging_sanitizer(limit, page, post_count)
voting_enabled = self.ticket.app.config.options.get('EnableVoting')
return dict(ticket=self.ticket, globals=c.app.globals,
http://git-wip-us.apache.org/repos/asf/allura/blob/fa8a9e48/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 8539409..3341377 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -504,8 +504,8 @@ class PageController(BaseController, FeedController):
@expose('jinja:forgewiki:templates/wiki/page_view.html')
@validate(dict(version=validators.Int(if_empty=None, if_invalid=None),
page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=25, if_invalid=25)))
- def index(self, version=None, page=0, limit=25, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, version=None, page=0, limit=None, **kw):
if not self.page:
redirect(c.app.url + h.urlquote(self.title) + '/edit')
c.confirmation = W.confirmation
@@ -513,7 +513,8 @@ class PageController(BaseController, FeedController):
c.attachment_list = W.attachment_list
c.subscribe_form = W.page_subscribe_form
post_count = self.page.discussion_thread.post_count
- limit, pagenum = h.paging_sanitizer(limit, page, post_count)
+ limit, pagenum, _ = g.handle_paging(limit, page)
+ limit, pagenum = h.paging_sanitizer(limit, pagenum, post_count)
page = self.get_version(version)
if page is None:
if version:
[07/10] allura git commit: [#7794] ticket:677 Remove hard limit on
page size where it makes sense
Posted by br...@apache.org.
[#7794] ticket:677 Remove hard limit on page size where it makes sense
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5eb6734d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5eb6734d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5eb6734d
Branch: refs/heads/master
Commit: 5eb6734d7899a38aa231a55945b6c917c98e0a52
Parents: 7b1769f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Nov 14 08:13:15 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:32 2014 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/controllers/forum.py | 4 ++--
ForgeDiscussion/forgediscussion/controllers/root.py | 12 ++++++------
ForgeShortUrl/forgeshorturl/main.py | 4 ++--
ForgeWiki/forgewiki/wiki_main.py | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5eb6734d/ForgeDiscussion/forgediscussion/controllers/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/forum.py b/ForgeDiscussion/forgediscussion/controllers/forum.py
index c83adaf..67dbea3 100644
--- a/ForgeDiscussion/forgediscussion/controllers/forum.py
+++ b/ForgeDiscussion/forgediscussion/controllers/forum.py
@@ -99,8 +99,8 @@ class ForumController(DiscussionController):
@expose('jinja:forgediscussion:templates/index.html')
@validate(dict(page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=25, if_invalid=25)))
- def index(self, threads=None, limit=25, page=0, count=0, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, threads=None, limit=None, page=0, count=0, **kw):
if self.discussion.deleted:
redirect(self.discussion.url() + 'deleted')
limit, page, start = g.handle_paging(limit, page)
http://git-wip-us.apache.org/repos/asf/allura/blob/5eb6734d/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 9256662..cf1116e 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -307,8 +307,8 @@ class RootRestController(BaseController):
return ForumRestController(unquote(forum)), remainder
@expose('json:')
- def index(self, limit=100, page=0, **kw):
- limit, page, start = g.handle_paging(int(limit), int(page))
+ def index(self, limit=None, page=0, **kw):
+ limit, page, start = g.handle_paging(limit, int(page))
forums = model.Forum.query.find(dict(
app_config_id=c.app.config._id,
parent_id=None, deleted=False)
@@ -377,8 +377,8 @@ class ForumRestController(BaseController):
require_access(self.forum, 'read')
@expose('json:')
- def index(self, limit=100, page=0, **kw):
- limit, page, start = g.handle_paging(int(limit), int(page))
+ def index(self, limit=None, page=0, **kw):
+ limit, page, start = g.handle_paging(limit, int(page))
topics = model.Forum.thread_class().query.find(
dict(discussion_id=self.forum._id))
topics = topics.sort([('flags', pymongo.DESCENDING),
@@ -423,8 +423,8 @@ class ForumTopicRestController(BaseController):
require_access(self.forum, 'read')
@expose('json:')
- def index(self, limit=100, page=0, **kw):
- limit, page, start = g.handle_paging(int(limit), int(page))
+ def index(self, limit=None, page=0, **kw):
+ limit, page, start = g.handle_paging(limit, int(page))
json_data = {}
json_data['topic'] = self.topic.__json__(limit=limit, page=page)
json_data['count'] = self.topic.query_posts(status='ok').count()
http://git-wip-us.apache.org/repos/asf/allura/blob/5eb6734d/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 377fa62..f4ab4ed 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -132,8 +132,8 @@ class RootController(BaseController):
@expose('jinja:forgeshorturl:templates/index.html')
@validate(dict(page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=100, if_invalid=100)))
- def index(self, page=0, limit=100, **kw):
+ limit=validators.Int(if_empty=None, if_invalid=None)))
+ def index(self, page=0, limit=None, **kw):
c.page_list = W.page_list
c.page_size = W.page_size
limit, pagenum, start = g.handle_paging(limit, page, default=100)
http://git-wip-us.apache.org/repos/asf/allura/blob/5eb6734d/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index e32a741..8539409 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -409,7 +409,7 @@ class RootController(BaseController, DispatchIndex, FeedController):
@expose('jinja:forgewiki:templates/wiki/browse_tags.html')
@validate(dict(sort=validators.UnicodeString(if_empty='alpha'),
page=validators.Int(if_empty=0, if_invalid=0),
- limit=validators.Int(if_empty=25, if_invalid=25)))
+ limit=validators.Int(if_empty=None, if_invalid=None)))
def browse_tags(self, sort='alpha', page=0, limit=None, **kw):
'list of all labels in the wiki'
c.page_list = W.page_list
[10/10] allura git commit: [#7794] ticket:686 Fix test back
Posted by br...@apache.org.
[#7794] ticket:686 Fix test back
Revert "[#7794] ticket:677 Fix test"
This reverts commit 86f76d5c405a008e4f453dde65579157387fab67.
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/65b7d9fb
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/65b7d9fb
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/65b7d9fb
Branch: refs/heads/master
Commit: 65b7d9fb440d821939b9fd4ea0213546a4c3b914
Parents: c084145
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Nov 19 08:56:08 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 19 22:58:33 2014 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/65b7d9fb/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index cab95eb..34b71c9 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -485,7 +485,7 @@ class TestForum(TestController):
r = self.app.get('/discussion/testforum/moderate/')
post = FM.ForumPost.query.get(text='Post content')
link = '<a href="%s">[%s]</a>' % (post.thread.url()
- + '?limit=50#' + post.slug, post.shorthand_id())
+ + '?limit=25#' + post.slug, post.shorthand_id())
assert link in r, link
def test_thread(self):