Commit: c827c21dc5d9852827a88bdaf6f9115793610286 - allura (git)

allura

Commit MetaInfo

• Revision: c827c21dc5d9852827a88bdaf6f9115793610286 (tree)
• Zeit: 2012-07-12 16:51:34
• Autor: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4525] ticket:113 Fix pagination.

Show pagination on Blog discussions.
Fix Forum default pagination limit.

Ändern Zusammenfassung

• modified: ForgeBlog/forgeblog/main.py
• modified: ForgeBlog/forgeblog/templates/blog/post.html
• modified: ForgeDiscussion/forgediscussion/controllers/forum.py

Diff

--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -272,16 +272,21 @@ class PostController(BaseController):
 
     @expose('jinja:forgeblog:templates/blog/post.html')
     @with_trailing_slash
-    def index(self, **kw):
+    @validate(dict(page=validators.Int(if_empty=0),
+                   limit=validators.Int(if_empty=25)))
+    def index(self, page=0, limit=25, **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 = h.paging_sanitizer(limit, page, post_count)
         version = kw.pop('version', None)
         post = self._get_version(version)
         base_post = self.post
-        return dict(post=post, base_post=base_post)
+        return dict(post=post, base_post=base_post,
+                    page=page, limit=limit, count=post_count)
 
     @expose('jinja:forgeblog:templates/blog/edit_post.html')
     @without_trailing_slash

--- a/ForgeBlog/forgeblog/templates/blog/post.html
+++ b/ForgeBlog/forgeblog/templates/blog/post.html
@@ -18,7 +18,7 @@
     <div style="clear:both;"></div>
     {% if post.discussion_thread and c.app.show_discussion %}
     <div style="margin-top: 10px">
-      {{c.thread.display(value=post.discussion_thread)}}
+      {{c.thread.display(value=post.discussion_thread,page=page,limit=limit,count=count)}}
     </div>
     {% endif %}
 {% endblock %}

--- a/ForgeDiscussion/forgediscussion/controllers/forum.py
+++ b/ForgeDiscussion/forgediscussion/controllers/forum.py
@@ -2,9 +2,10 @@ import logging
 import pymongo
 
 from tg import expose, validate, redirect
-from tg import request, response
+from tg import request
 from pylons import g, c
 from webob import exc
+from formencode import validators
 
 from allura.lib import helpers as h
 from allura.lib import utils
@@ -75,7 +76,9 @@ class ForumController(DiscussionController):
             raise exc.HTTPNotFound()
 
     @expose('jinja:allura:templates/discussion/index.html')
-    def index(self, threads=None, limit=None, page=0, count=0, **kw):
+    @validate(dict(page=validators.Int(if_empty=0),
+                   limit=validators.Int(if_empty=25)))
+    def index(self, threads=None, limit=10, page=0, count=0, **kw):
         if self.discussion.deleted:
             redirect(self.discussion.url()+'deleted')
         limit, page, start = g.handle_paging(limit, page)
@@ -105,7 +108,9 @@ class ForumController(DiscussionController):
 class ForumThreadController(ThreadController):
 
     @expose('jinja:forgediscussion:templates/discussionforums/thread.html')
-    def index(self, limit=None, page=0, count=0, **kw):
+    @validate(dict(page=validators.Int(if_empty=0),
+                   limit=validators.Int(if_empty=25)))
+    def index(self, limit=25, page=0, count=0, **kw):
         if self.thread.discussion.deleted and not has_access(c.app, 'configure')():
             redirect(self.thread.discussion.url()+'deleted')
         return super(ForumThreadController, self).index(limit=limit, page=page, count=count, show_moderate=True, **kw)