Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/fieldcreate.py b/tracker/fieldcreate.py
index ead72ad..b1f2316 100644
--- a/tracker/fieldcreate.py
+++ b/tracker/fieldcreate.py
@@ -15,6 +15,7 @@
 import ezt
 
 from framework import exceptions
+from framework import flaskservlet
 from framework import framework_helpers
 from framework import jsonfeed
 from framework import permissions
@@ -30,7 +31,7 @@
 class FieldCreate(servlet.Servlet):
   """Servlet allowing project owners to create a custom field."""
 
-  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_PROCESS
+  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_PROCESS
   _PAGE_TEMPLATE = 'tracker/field-create-page.ezt'
 
   def AssertBasePermission(self, mr):
@@ -198,6 +199,12 @@
     return framework_helpers.FormatAbsoluteURL(
         mr, urls.ADMIN_LABELS, saved=1, ts=int(time.time()))
 
+  # def GetFieldCreate(self, **kwargs):
+  #   return self.handler(**kwargs)
+
+  # def PostFieldCreate(self, **kwargs):
+  #   return self.handler(**kwargs)
+
 
 def FieldNameErrorMessage(field_name, config):
   """Return an error message for the given field name, or None."""