Search: Add pref to enable legacy search.

r2/r2/controllers/front.py

@@ -1045,7 +1045,7 @@ def GET_search(self, query, num, reverse, after, count, sort, recent,
         cleanup_message = None
         converted_data = None
         subreddit_facets = None
-        legacy_render_class = feature.is_enabled('legacy_search')
+        legacy_render_class = feature.is_enabled('legacy_search') or c.user.pref_legacy_search
 
         if num > 0 and has_query:
             nav_menus = [SearchSortMenu(default=sort), TimeMenu(default=recent)]

r2/r2/lib/pages/pages.py

@@ -1435,7 +1435,7 @@ def __init__(self, pagename, prev_search,
                  syntax=None, converted_data=None, facets={}, sort=None,
                  recent=None, subreddits=None,
                  *a, **kw):
-        if not feature.is_enabled('legacy_search'):
+        if not (feature.is_enabled('legacy_search') or c.user.pref_legacy_search):
             self.extra_page_classes = self.extra_page_classes + ['combined-search-page']
         self.searchbar = SearchBar(prev_search=prev_search,
                                    search_params=search_params,
@@ -1462,7 +1462,7 @@ def __init__(self, pagename, prev_search,
         BoringPage.__init__(self, pagename, robots='noindex', *a, **kw)
 
     def content(self):
-        if feature.is_enabled('legacy_search'):
+        if feature.is_enabled('legacy_search') or c.user.pref_legacy_search:
             return self.content_stack((self.searchbar, self.sr_facets, self.infobar,
                                    self.nav_menu, self.subreddits, self._content))
 

r2/r2/lib/validator/preferences.py

@@ -83,6 +83,7 @@
     pref_default_theme_sr=VSRByName("theme_selector", False),
     pref_other_theme=VSRByName("other_theme", False),
     pref_beta=VBoolean('beta'),
+    pref_legacy_search=VBoolean('legacy_search'),
 )
 
 

r2/r2/lib/validator/validator.py

@@ -2920,7 +2920,7 @@ def run(self, result_types):
 
         if is_api():
             result_types = result_types or {'link'}
-        elif feature.is_enabled('legacy_search'):
+        elif feature.is_enabled('legacy_search') or c.user.pref_legacy_search:
             result_types = {'link'}
         else:
             result_types = result_types or {'link', 'sr'}

r2/r2/models/account.py

@@ -112,6 +112,7 @@ class Account(Thing):
                      pref_public_server_seconds=False,
                      pref_ignore_suggested_sort=False,
                      pref_beta=False,
+                     pref_legacy_search=False,
                      mobile_compress = False,
                      mobile_thumbnail = True,
                      reported = 0,

r2/r2/templates/prefoptions.html

@@ -292,6 +292,10 @@
         ${checkbox(_("show self-serve advertising tab on front page"), 
           "show_promote")}
       %endif
+      %if feature.is_enabled('legacy_search_pref'):
+        <br>
+        ${checkbox(_("show legacy search page"), "legacy_search")}
+      %endif
     </td>
   </tr>
   <tr>

r2/r2/templates/searchform.html

@@ -61,12 +61,12 @@
          %endif
          name="q" placeholder="${_('search')}" tabindex="20">
 
-  %if not feature.is_enabled('legacy_search') and not thing.simple:
+  %if feature.is_enabled('legacy_search') or c.user.pref_legacy_search or thing.simple:
+    <input type="submit" value="" tabindex="22">
+  %else:
     <button class="search-submit-button c-btn c-btn-primary" type='submit' aria-label="${_("Search")}">
       <span class="search-icon"></span>
     </button>
-  %else:
-    <input type="submit" value="" tabindex="22">
   %endif
 
   %if thing.subreddit_search: