Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/issuedetailezt.py b/tracker/issuedetailezt.py
index 3a10443..233ea57 100644
--- a/tracker/issuedetailezt.py
+++ b/tracker/issuedetailezt.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Classes that implement the issue detail page and related forms.
@@ -14,45 +13,20 @@
from __future__ import division
from __future__ import absolute_import
-import json
-import logging
-import time
-import ezt
-
import settings
-from api import converters
from businesslogic import work_env
from features import features_bizobj
-from features import send_notifications
from features import hotlist_helpers
-from features import hotlist_views
from framework import exceptions
-from framework import flaskservlet
-from framework import framework_bizobj
-from framework import framework_constants
from framework import framework_helpers
-from framework import framework_views
from framework import jsonfeed
-from framework import paginate
from framework import permissions
from framework import servlet
from framework import servlet_helpers
-from framework import sorting
-from framework import sql
-from framework import template_helpers
from framework import urls
-from framework import xsrf
-from proto import user_pb2
-from proto import tracker_pb2
from services import features_svc
-from services import tracker_fulltext
-from tracker import field_helpers
-from tracker import tracker_bizobj
from tracker import tracker_constants
from tracker import tracker_helpers
-from tracker import tracker_views
-
-from google.protobuf import json_format
def CheckMoveIssueRequest(
@@ -126,9 +100,7 @@
class FlipperRedirectBase(servlet.Servlet):
- # pylint: disable=arguments-differ
- # pylint: disable=unused-argument
- def get(self, project_name=None, viewed_username=None, hotlist_id=None):
+ def get(self):
with work_env.WorkEnv(self.mr, self.services) as we:
hotlist_id = self.mr.GetIntParam('hotlist_id')
current_issue = we.GetIssueByLocalID(self.mr.project_id, self.mr.local_id,
@@ -159,24 +131,22 @@
class FlipperNext(FlipperRedirectBase):
next_handler = True
- # def GetFlipperNextRedirectPage(self, **kwargs):
- # self.next_handler = True
- # return self.handler(**kwargs)
+ def GetFlipperNextRedirectPage(self, **kwargs):
+ self.next_handler = True
+ return self.handler(**kwargs)
class FlipperPrev(FlipperRedirectBase):
next_handler = False
- # def GetFlipperPrevRedirectPage(self, **kwargs):
- # self.next_handler = False
- # return self.handler(**kwargs)
+ def GetFlipperPrevRedirectPage(self, **kwargs):
+ self.next_handler = False
+ return self.handler(**kwargs)
class FlipperList(servlet.Servlet):
- # pylint: disable=arguments-differ
- # pylint: disable=unused-argument
- # TODO: (monorail:6511)change to get(self) when convert to flask
- def get(self, project_name=None, viewed_username=None, hotlist_id=None):
+
+ def get(self):
with work_env.WorkEnv(self.mr, self.services) as we:
hotlist_id = self.mr.GetIntParam('hotlist_id')
current_issue = we.GetIssueByLocalID(self.mr.project_id, self.mr.local_id,
@@ -199,11 +169,10 @@
hotlist, self.services)
self.redirect(url)
- # def GetFlipperList(self, **kwargs):
- # return self.handler(**kwargs)
+ def GetFlipperList(self, **kwargs):
+ return self.handler(**kwargs)
-# TODO: (monorail:6511) change to flaskJsonFeed when convert to flask
class FlipperIndex(jsonfeed.JsonFeed):
"""Return a JSON object of an issue's index in search.
@@ -274,11 +243,11 @@
'total_count': total_count,
}
- # def GetFlipperIndex(self, **kwargs):
- # return self.handler(**kwargs)
+ def GetFlipperIndex(self, **kwargs):
+ return self.handler(**kwargs)
- # def PostFlipperIndex(self, **kwargs):
- # return self.handler(**kwargs)
+ def PostFlipperIndex(self, **kwargs):
+ return self.handler(**kwargs)
def _ShouldShowFlipper(mr, services):