Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issuetips.py b/tracker/issuetips.py
index eb75265..f85bcd6 100644
--- a/tracker/issuetips.py
+++ b/tracker/issuetips.py
@@ -10,6 +10,7 @@
 
 import logging
 
+from framework import flaskservlet
 from framework import servlet
 from framework import permissions
 
@@ -18,7 +19,7 @@
   """IssueSearchTips on-line help on how to use issue search."""
 
   _PAGE_TEMPLATE = 'tracker/issue-search-tips.ezt'
-  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
+  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
 
   def GatherPageData(self, mr):
     """Build up a dictionary of data values to use when rendering the page."""
@@ -27,3 +28,6 @@
         'issue_tab_mode': 'issueSearchTips',
         'page_perms': self.MakePagePerms(mr, None, permissions.CREATE_ISSUE),
     }
+
+  # def GetIssueSearchTips(self, **kwargs):
+  #   return self.handler(**kwargs)