From d11a16dee88db2850d3c82b4482ed77db2967fda Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Thu, 19 Sep 2013 04:19:37 -0400 Subject: [PATCH] SubredditSelector searches optional. --- r2/r2/lib/pages/pages.py | 13 +++++++++---- r2/r2/templates/subredditselector.html | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 8a1f6c441..6142918e5 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -4253,7 +4253,8 @@ class SubscribeButton(Templated): class SubredditSelector(Templated): - def __init__(self, default_sr=None, extra_subreddits=None, required=False): + def __init__(self, default_sr=None, extra_subreddits=None, required=False, + include_searches=True): Templated.__init__(self) if extra_subreddits: @@ -4268,9 +4269,13 @@ class SubredditSelector(Templated): self.default_sr = default_sr self.required = required - self.sr_searches = simplejson.dumps( - popular_searches(include_over_18=c.over18) - ) + if include_searches: + self.sr_searches = simplejson.dumps( + popular_searches(include_over_18=c.over18) + ) + else: + self.sr_searches = simplejson.dumps({}) + self.include_searches = include_searches @property def subreddit_names(self): diff --git a/r2/r2/templates/subredditselector.html b/r2/r2/templates/subredditselector.html index 659420a6e..74477f5ca 100644 --- a/r2/r2/templates/subredditselector.html +++ b/r2/r2/templates/subredditselector.html @@ -8,7 +8,9 @@