github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-30 17:28:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

wiki: Remove c.page_obj.

Browse Source
This commit is contained in:
Andre D
2012-09-13 03:12:56 -05:00
committed by Neil Williams
parent 967d725751
commit b64f29b235
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
r2/r2/controllers/validator/wiki.py
View File

@@ -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):

5
r2/r2/lib/pages/wiki.py
View File

@@ -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)