diff --git a/r2/r2/controllers/wiki.py b/r2/r2/controllers/wiki.py index 1cd1f0b53..bc71e3f5d 100644 --- a/r2/r2/controllers/wiki.py +++ b/r2/r2/controllers/wiki.py @@ -194,8 +194,12 @@ class WikiController(RedditController): def GET_wiki_settings(self, page): settings = {'permlevel': page._get('permlevel', 0)} mayedit = page.get_editor_accounts() + restricted = (not page.special) and page.restricted + show_editors = not restricted return WikiSettings(settings, mayedit, show_settings=not page.special, - page=page.name, may_revise=True).render() + page=page.name, show_editors=show_editors, + restricted=restricted, + may_revise=True).render() @wiki_validate(VModhash(), page=VWikiPage('page', restricted=True, modonly=True), diff --git a/r2/r2/lib/pages/wiki.py b/r2/r2/lib/pages/wiki.py index 998f7ab52..44acc6dc8 100644 --- a/r2/r2/lib/pages/wiki.py +++ b/r2/r2/lib/pages/wiki.py @@ -34,9 +34,11 @@ class WikiEditPage(Templated): Templated.__init__(self) class WikiPageSettings(Templated): - def __init__(self, settings, mayedit, show_settings=True, page=None, **context): + def __init__(self, settings, mayedit, show_editors=True, + show_settings=True, page=None, **context): self.permlevel = settings['permlevel'] self.show_settings = show_settings + self.show_editors = show_editors self.page = page self.base_url = c.wiki_base_url self.mayedit = mayedit @@ -120,8 +122,10 @@ class WikiEdit(WikiBase): WikiBase.__init__(self, content, page=page, **context) class WikiSettings(WikiBase): - def __init__(self, settings, mayedit, page, **context): + def __init__(self, settings, mayedit, page, restricted, **context): content = WikiPageSettings(settings, mayedit, page=page, **context) + if restricted: + context['alert'] = _("This page is restricted, only moderators may edit it.") context['wikiaction'] = ('settings', _("settings")) WikiBase.__init__(self, content, page=page, **context) diff --git a/r2/r2/templates/wikipagesettings.html b/r2/r2/templates/wikipagesettings.html index 51733ef44..864ad057d 100644 --- a/r2/r2/templates/wikipagesettings.html +++ b/r2/r2/templates/wikipagesettings.html @@ -51,7 +51,7 @@ %endif - %if thing.permlevel != 2: + %if thing.show_editors and thing.permlevel != 2:
<%utils:line_field title="${_('allow users to edit page')}">