提交: f3e4da9020167688733415f816863d8d0baebe6e - allura (git)

allura

Commit MetaInfo

• 修訂: f3e4da9020167688733415f816863d8d0baebe6e (tree)
• 時間: 2011-02-19 01:15:58
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Log Message

[#1468] Moderation fixes

Signed-off-by: Jenny Steele <[e-mail]>

Change Summary

• modified: Allura/allura/controllers/discuss.py
• modified: Allura/allura/lib/widgets/discuss.py
• modified: Allura/allura/model/discuss.py
• modified: Allura/allura/templates/discussion/moderate.html
• modified: ForgeDiscussion/forgediscussion/controllers/forum.py
• modified: ForgeTracker/forgetracker/tracker_main.py
• modified: ForgeWiki/forgewiki/wiki_main.py

差異

--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -369,12 +369,14 @@ class DiscussionAttachmentsController(AttachmentsController):
 
 class ModerationController(BaseController):
     __metaclass__=h.ProxiedAttrMeta
+    PostModel = M.Post
     M=h.attrproxy('_discussion_controller', 'M')
     W=h.attrproxy('_discussion_controller', 'W')
     ThreadController=h.attrproxy('_discussion_controller', 'ThreadController')
     PostController=h.attrproxy('_discussion_controller', 'PostController')
     AttachmentController=h.attrproxy('_discussion_controller', 'AttachmentController')
 
+
     def _check_security(self):
         require(has_artifact_access('moderate', self.discussion))
 
@@ -389,10 +391,10 @@ class ModerationController(BaseController):
     @expose('jinja:discussion/moderate.html')
     @validate(pass_validator)
     def index(self, **kw):
-        kw = WidgetConfig.post_filter.to_python(kw, None)
+        kw = WidgetConfig.post_filter.validate(kw, None)
         page = kw.pop('page', 0)
         limit = kw.pop('limit', 50)
-        status = kw.pop('status', '-')
+        status = kw.pop('status', 'pending')
         flag = kw.pop('flag', None)
         c.post_filter = WidgetConfig.post_filter
         c.moderate_posts = WidgetConfig.moderate_posts
@@ -402,8 +404,10 @@ class ModerationController(BaseController):
             query['status'] = status
         if flag:
             query['flags'] = {'$gte': int(flag) }
-        q = M.Post.query.find(query)
+        q = self.PostModel.query.find(query)
         count = q.count()
+        if not page:
+            page = 0
         page = int(page)
         limit = int(limit)
         q = q.skip(page)
@@ -418,21 +422,16 @@ class ModerationController(BaseController):
     @h.vardec
     @expose()
     @require_post()
-    def moderate(self, post=None,
-                 approve=None,
-                 spam=None,
-                 delete=None,
-                 **kw):
-        for args in post:
-            if not args.get('checked', False): continue
-            post = M.Post.query.get(slug=args['slug'])
-            if approve:
-                if post.status != 'ok':
-                    post.approve()
-            elif spam:
-                if post.status != 'spam': post.spam()
-            elif delete:
-                post.delete()
+    def save_moderation(self, post=None, delete=None, spam=None, approve=None, **kw):
+        for p in post:
+            if 'checked' in p:
+                posted = self.PostModel.query.get(slug=p['slug'])
+                if delete:
+                    posted.delete()
+                elif spam:
+                    posted.status = 'spam'
+                elif approve:
+                    posted.status = 'ok'
         redirect(request.referer)
 
 class PostRestController(PostController):

--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -87,7 +87,7 @@ class PostFilter(ff.ForgeForm):
                         ew.Option(py_value='spam', label='Spam'),
                         ew.Option(py_value='pending', label='Pending moderation'),
                         ew.Option(py_value='ok', label='Ok')],
-                    if_missing='-'),
+                    if_missing='pending'),
                 ew.IntField(name='flag',
                             label='Show posts with at least "n" flags',
                             css_class='text',

--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -302,6 +302,7 @@ class Post(Message, VersionedArtifact):
     class __mongometa__:
         name='post'
         history_class = PostHistory
+        indexes = [ 'discussion_id', 'thread_id' ]
     type_s = 'Post'
 
     thread_id = ForeignIdProperty(Thread)

--- a/Allura/allura/templates/discussion/moderate.html
+++ b/Allura/allura/templates/discussion/moderate.html
@@ -16,6 +16,6 @@ Moderation Queue
   <a href="?status={{status}}&amp;flag={{flag}}&amp;page={{page-limit}}">Previous Page</a>
   <a href="?status={{status}}&amp;flag={{flag}}&amp;page={{page+limit}}">Next Page</a>
 </div>
-{{c.post_filter.display(action='.', value=dict(status=status, flag=flag))}}
-{{c.moderate_posts.display(value=dict(posts=posts), action='.')}}
+{{c.post_filter.display(action=discussion.url()+'moderate', value=dict(status=status, flag=flag))}}
+{{c.moderate_posts.display(value=dict(posts=posts), action=discussion.url()+'moderate/save_moderation')}}
 {% endblock %}

--- a/ForgeDiscussion/forgediscussion/controllers/forum.py
+++ b/ForgeDiscussion/forgediscussion/controllers/forum.py
@@ -142,48 +142,4 @@ class ForumPostController(PostController):
         super(ForumPostController, self).moderate(**kw)
 
 class ForumModerationController(ModerationController):
-
-    @h.vardec
-    @expose('jinja:discussion/moderate.html')
-    @validate(pass_validator)
-    def index(self, post=None, **kw):
-        if kw.pop('delete', None):
-            for p in post:
-                if 'checked' in p:
-                    posted = DM.ForumPost.query.find(dict(slug=p['slug'])).first()
-                    posted.delete()
-        elif kw.pop('spam', None):
-            for p in post:
-                if 'checked' in p:
-                    posted = DM.ForumPost.query.find(dict(slug=p['slug'])).first()
-                    posted.status = 'spam'
-        elif kw.pop('approve', None):
-            for p in post:
-                if 'checked' in p:
-                    posted = DM.ForumPost.query.find(dict(slug=p['slug'])).first()
-                    posted.status = 'ok'
-        kw = WidgetConfig.post_filter.validate(kw, None)
-        page = kw.pop('page', 0)
-        limit = kw.pop('limit', 50)
-        status = kw.pop('status', '-')
-        flag = kw.pop('flag', None)
-        c.post_filter = WidgetConfig.post_filter
-        c.moderate_posts = WidgetConfig.moderate_posts
-        query = dict(
-            discussion_id=self.discussion._id)
-        if status != '-':
-            query['status'] = status
-        if flag:
-            query['flags'] = {'$gte': int(flag) }
-        q = DM.ForumPost.query.find(query)
-        count = q.count()
-        page = int(page)
-        limit = int(limit)
-        q = q.skip(page)
-        q = q.limit(limit)
-        pgnum = (page // limit) + 1
-        pages = (count // limit) + 1
-        return dict(discussion=self.discussion,
-                    posts=q, page=page, limit=limit,
-                    status=status, flag=flag,
-                    pgnum=pgnum, pages=pages)
+    PostModel = DM.ForumPost

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -156,6 +156,11 @@ class ForgeTrackerApp(Application):
             links.append(SitemapEntry('Edit Milestones', self.config.url() + 'milestones', ui_icon=g.icons['table']))
             links.append(SitemapEntry('Edit Searches', c.project.url() + 'admin/' + c.app.config.options.mount_point + '/bins/', ui_icon=g.icons['search']))
         links.append(SitemapEntry('View Stats', self.config.url() + 'stats', ui_icon=g.icons['stats']))
+        discussion = c.app.config.discussion
+        pending_mod_count = M.Post.query.find({'discussion_id':discussion._id, 'status':'pending'}).count()
+        if pending_mod_count and h.has_artifact_access('moderate', discussion)():
+            links.append(SitemapEntry('Moderate', discussion.url() + 'moderate', ui_icon=g.icons['pencil'],
+                small = pending_mod_count))
         if ticket:
             for aref in ticket.references+ticket.backreferences.values():
                 artifact = M.ArtifactReference(aref).artifact

--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -177,8 +177,13 @@ class ForgeWikiApp(Application):
         links = links + [
             SitemapEntry('Wiki Home',c.app.url),
             SitemapEntry('Browse Pages',c.app.url+'browse_pages/'),
-            SitemapEntry('Browse Labels',c.app.url+'browse_tags/'),
-            SitemapEntry(''),
+            SitemapEntry('Browse Labels',c.app.url+'browse_tags/')]
+        discussion = c.app.config.discussion
+        pending_mod_count = M.Post.query.find({'discussion_id':discussion._id, 'status':'pending'}).count()
+        if pending_mod_count and h.has_artifact_access('moderate', discussion)():
+            links.append(SitemapEntry('Moderate', discussion.url() + 'moderate', ui_icon=g.icons['pencil'],
+                small = pending_mod_count))
+        links = links + [SitemapEntry(''),
             SitemapEntry('Wiki Help',c.app.url+'wiki_help/', className='nav_child'),
             SitemapEntry('Markdown Syntax',c.app.url+'markdown_syntax/', className='nav_child')
         ]