From b64f29b235a5232c6f0e863d0b7a06f22792a562 Mon Sep 17 00:00:00 2001 From: Andre D Date: Thu, 13 Sep 2012 03:12:56 -0500 Subject: [PATCH] wiki: Remove c.page_obj. --- r2/r2/controllers/validator/wiki.py | 7 +++---- r2/r2/lib/pages/wiki.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/r2/r2/controllers/validator/wiki.py b/r2/r2/controllers/validator/wiki.py index 8d1f58a5b..2be531187 100644 --- a/r2/r2/controllers/validator/wiki.py +++ b/r2/r2/controllers/validator/wiki.py @@ -214,10 +214,9 @@ class VWikiPage(Validator): wp = self.validpage(page) except AbortWikiError: return - - # TODO: MAKE NOT REQUIRED - c.wiki_page_obj = wp - + + c.wiki_may_revise = this_may_revise(wp) + return wp def validpage(self, page): diff --git a/r2/r2/lib/pages/wiki.py b/r2/r2/lib/pages/wiki.py index 43c3f373d..d70ae977c 100644 --- a/r2/r2/lib/pages/wiki.py +++ b/r2/r2/lib/pages/wiki.py @@ -12,7 +12,6 @@ class WikiView(Templated): self.edit_by = edit_by self.edit_date = edit_date self.base_url = c.wiki_base_url - self.may_revise = this_may_revise(c.wiki_page_obj) Templated.__init__(self) class WikiPageListing(Templated): @@ -69,7 +68,7 @@ class WikiBase(Reddit): if not actionless and c.wiki_page: title = '%s - %s' % (title, c.wiki_page) pageactions += [(c.wiki_page, _("view"), False)] - if this_may_revise(c.wiki_page_obj): + if c.wiki_may_revise: pageactions += [('edit', _("edit"), True)] pageactions += [('revisions/%s' % c.wiki_page, _("history"), False)] pageactions += [('discussions', _("talk"), True)] @@ -89,7 +88,7 @@ class WikiBase(Reddit): class WikiPageView(WikiBase): def __init__(self, content, diff=None, **context): if not content and not context.get('alert'): - if this_may_revise(c.wiki_page_obj): + if c.wiki_may_revise: context['alert'] = _("this page is empty, edit it to add some content.") content = WikiView(content, context.get('edit_by'), context.get('edit_date'), diff=diff) WikiBase.__init__(self, content, **context)