Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issueexport.py b/tracker/issueexport.py
index a457a17..91620c4 100644
--- a/tracker/issueexport.py
+++ b/tracker/issueexport.py
@@ -16,6 +16,7 @@
from businesslogic import work_env
from features import savedqueries_helpers
+from framework import flaskservlet
from framework import permissions
from framework import jsonfeed
from framework import servlet
@@ -26,7 +27,7 @@
"""IssueExportControls let's an admin choose how to export issues."""
_PAGE_TEMPLATE = 'tracker/issue-export-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."""
@@ -69,7 +70,11 @@
'saved_queries': saved_query_views,
}
+ # def GetIssueExport(self, **kwargs):
+ # return self.handler(**kwargs)
+
+# TODO: convert to FLaskJsonFeed while conver to flask
class IssueExportJSON(jsonfeed.JsonFeed):
"""IssueExport shows a range of issues in JSON format."""
@@ -277,3 +282,9 @@
if merge.project_id == mr.project.project_id:
issue_json['merged_into'] = merge.local_id
return issue_json
+
+ # def GetIssueExportJSON(self, **kwargs):
+ # return self.handler(**kwargs)
+
+ # def PostIssueExportJSON(self, **kwargs):
+ # return self.handler(**kwargs)