diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index a89b283be..f9c153f58 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -2574,7 +2574,6 @@ class ApiController(RedditController): suggested_comment_sort=VOneOf('suggested_comment_sort', CommentSortMenu._options, default=None), - quarantine = VBoolean('quarantine'), # community_rules = VLength('community_rules', max_length=1024), # related_subreddits = VSubredditList('related_subreddits', limit=20), # key_color = VColor('key_color'), @@ -2648,7 +2647,6 @@ class ApiController(RedditController): 'over_18', 'public_description', 'public_traffic', - 'quarantine', 'related_subreddits', 'show_cname_sidebar', 'show_media', @@ -2738,13 +2736,6 @@ class ApiController(RedditController): if kw['type'] == 'employees_only' and not can_set_employees_only: c.errors.add(errors.INVALID_OPTION, field='type') - # if user is not an admin, set the quarantine argument to the original value - if not c.user_is_admin: - if sr: - kw['quarantine'] = sr.quarantine - else: - kw['quarantine'] = False - if not sr and form.has_errors("ratelimit", errors.RATELIMIT): pass elif not sr and form.has_errors("", errors.CANT_CREATE_SR): @@ -2815,12 +2806,10 @@ class ApiController(RedditController): update_wiki_text(sr) - update_stylesheet = kw['quarantine'] != sr.quarantine - if not sr.domain: del kw['css_on_cname'] - if kw['quarantine']: + if sr.quarantine: del kw['allow_top'] del kw['show_media'] @@ -2855,11 +2844,6 @@ class ApiController(RedditController): setattr(sr, k, v) sr._commit() - if update_stylesheet: - stylesheet_contents = sr.fetch_stylesheet_source() - css_errors, parsed = sr.parse_css(stylesheet_contents) - sr.change_css(stylesheet_contents, parsed) - #update the domain cache if the domain changed if sr.domain != old_domain: Subreddit._by_domain(old_domain, _update = True) diff --git a/r2/r2/controllers/api_docs.py b/r2/r2/controllers/api_docs.py index baee5253c..75c4d6551 100644 --- a/r2/r2/controllers/api_docs.py +++ b/r2/r2/controllers/api_docs.py @@ -150,10 +150,6 @@ class ApidocsController(RedditController): docs['parameters'] = {} docs.update(api_doc) - # hide quarantine as a parameter - if 'parameters' in api_doc: - docs['parameters'].pop('quarantine', None) - # append a message to the docstring if supplied notes = docs.get("notes") if notes: diff --git a/r2/r2/templates/createsubreddit.html b/r2/r2/templates/createsubreddit.html index 606ba7960..9cc9e471c 100644 --- a/r2/r2/templates/createsubreddit.html +++ b/r2/r2/templates/createsubreddit.html @@ -175,16 +175,6 @@ try participating in other communities on reddit for a little while first before ${error_field("GOLD_REQUIRED", "type")} ${error_field("CANT_CONVERT_TO_GOLD_ONLY", "type")} - - %if c.user_is_admin: - - - %endif <%utils:line_field title="${_('content options')}">