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 2012/09/21 22:18:34 UTC
[13/16] git commit: [#4077] ticket:166 fix max limit error
[#4077] ticket:166 fix max limit error
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a29e77c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a29e77c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a29e77c4
Branch: refs/heads/master
Commit: a29e77c48bb3b576e0056f75a4b325e55dcb6811
Parents: 80bffb4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Sep 17 14:21:01 2012 +0300
Committer: Dave Brondsema <db...@geek.net>
Committed: Wed Sep 19 17:16:16 2012 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 11 ++++-------
.../forgediscussion/controllers/root.py | 13 +++++++------
2 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a29e77c4/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 01ca263..931d728 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -1,4 +1,3 @@
-import sys
import logging
from datetime import datetime
@@ -290,9 +289,6 @@ class Thread(Artifact, ActivityObject):
def query_posts(self, page=None, limit=None,
timestamp=None, style='threaded'):
- if limit is None:
- limit = 50
- limit = int(limit)
if timestamp:
terms = dict(discussion_id=self.discussion_id, thread_id=self._id,
status={'$in': ['ok', 'pending']}, timestamp=timestamp)
@@ -304,9 +300,10 @@ class Thread(Artifact, ActivityObject):
q = q.sort('full_slug')
else:
q = q.sort('timestamp')
- if page is not None:
- q = q.skip(page * limit)
if limit is not None:
+ limit = int(limit)
+ if page is not None:
+ q = q.skip(page * limit)
q = q.limit(limit)
return q
@@ -518,7 +515,7 @@ class Post(Message, VersionedArtifact, ActivityObject):
# all posts in a single page
page = 0
else:
- posts = self.thread.find_posts(None, sys.maxint)
+ posts = self.thread.find_posts()
posts = self.thread.create_post_threads(posts)
def find_i(posts):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a29e77c4/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 89648c4..8a8158c 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -137,12 +137,13 @@ class RootController(BaseController, DispatchIndex):
'-deleted_b:true'])
if results: count=results.hits
c.search_results = self.W.search_results
- for doc in results:
- if doc.get('type_s', '') == 'Post':
- _id = doc.get('id').split('#')
- _id = _id[-1].replace('/', '.') if _id else ''
- p = model.ForumPost.query.get(_id=_id)
- doc['url_paginated'] = p.url_paginated()
+ if results is not None:
+ for doc in results:
+ if doc.get('type_s', '') == 'Post':
+ _id = doc.get('id').split('#')
+ _id = _id[-1].replace('/', '.') if _id else ''
+ p = model.ForumPost.query.get(_id=_id)
+ doc['url_paginated'] = p.url_paginated()
return dict(q=q, history=history, results=results or [],
count=count, limit=limit, page=page)