Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issueimport.py b/tracker/issueimport.py
index 1e0289b..bd54db9 100644
--- a/tracker/issueimport.py
+++ b/tracker/issueimport.py
@@ -17,6 +17,7 @@
import ezt
from features import filterrules_helpers
+from framework import flaskservlet
from framework import framework_helpers
from framework import jsonfeed
from framework import permissions
@@ -35,7 +36,7 @@
"""IssueImport loads a file of issues in JSON format."""
_PAGE_TEMPLATE = 'tracker/issue-import-page.ezt'
- _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
+ _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
def AssertBasePermission(self, mr):
"""Make sure that the logged in user has permission to view this page."""
@@ -304,6 +305,12 @@
self.services.issue.SetUsedLocalID(cnxn, project_id)
event_log.append('Finished import')
+ # def GetIssueImport(self, **kwargs):
+ # return self.handler(**kwargs)
+
+ # def PostIssueImport(self, **kwargs):
+ # return self.handler(**kwargs)
+
class JSONImportError(Exception):
"""Exception to raise if imported JSON is invalid."""