github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Subreddit Rules: Support ReportForm for Messages

Browse Source 
Messages don't have a subreddit so this was failing. Only attempt
to get subreddit rules for comments and links.
This commit is contained in:
MelissaCole
2015-11-24 11:37:43 -08:00
parent 7fe7068daa
commit 2036aced15
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
r2/r2/lib/pages/pages.py
View File

@@ -3302,12 +3302,15 @@ class Gilding(Templated):
class ReportForm(CachedTemplate):
def __init__(self, thing=None, **kw):
subreddit = thing.subreddit_slow
self.rules = []
self.system_rules = []
self.thing_fullname = thing._fullname
subreddit = None
if feature.is_enabled("subreddit_rules", subreddit=subreddit.name):
if isinstance(thing, Comment, Link):
subreddit = thing.subreddit_slow
if (subreddit and
feature.is_enabled("subreddit_rules", subreddit=subreddit.name)):
for rule in SubredditRules.get_rules(subreddit):
self.rules.append(rule["short_name"])
if self.rules:
@@ -3322,12 +3325,15 @@ class ReportForm(CachedTemplate):
class SubredditReportForm(CachedTemplate):
def __init__(self, thing=None, **kw):
subreddit = thing.subreddit_slow
self.rules = []
self.system_rules = []
self.thing_fullname = thing._fullname
subreddit = None
if feature.is_enabled("subreddit_rules", subreddit=subreddit.name):
if isinstance(thing, Comment, Link):
subreddit = thing.subreddit_slow
if (subreddit and
feature.is_enabled("subreddit_rules", subreddit=subreddit.name)):
for rule in SubredditRules.get_rules(subreddit):
self.rules.append(rule["short_name"])
if self.rules: