Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issueadvsearch.py b/tracker/issueadvsearch.py
index d824098..f702763 100644
--- a/tracker/issueadvsearch.py
+++ b/tracker/issueadvsearch.py
@@ -17,6 +17,7 @@
 import re
 
 from features import savedqueries_helpers
+from framework import flaskservlet
 from framework import framework_helpers
 from framework import permissions
 from framework import servlet
@@ -31,7 +32,7 @@
   """IssueAdvancedSearch shows a form to enter an advanced search."""
 
   _PAGE_TEMPLATE = 'tracker/issue-advsearch-page.ezt'
-  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
+  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
 
   # This form *only* redirects to a GET request, and permissions are checked
   # in that handler.
@@ -121,3 +122,9 @@
       values = VALUE_RE.findall(user_input)
       search_term = '%s%s' % (operator, ','.join(values))
       search_query.append(search_term)
+
+  # def GetIssueAdvSearchPage(self, **kwargs):
+  #   return self.handler(**kwargs)
+
+  # def PostIssueAdvSearchPage(self, **kwargs):
+  #   return self.handler(**kwargs)
\ No newline at end of file