Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/hotlistdetails.py b/features/hotlistdetails.py
index f9c0435..5548362 100644
--- a/features/hotlistdetails.py
+++ b/features/hotlistdetails.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.
"""Servlets for hotlist details main subtab."""
from __future__ import print_function
@@ -14,10 +13,9 @@
from features import hotlist_helpers
from framework import framework_bizobj
-from framework import flaskservlet
from framework import framework_helpers
-from framework import servlet
from framework import permissions
+from framework import servlet
from framework import urls
_MSG_DESCRIPTION_MISSING = 'Description is missing.'
@@ -33,7 +31,7 @@
"""A page with hotlist details and editing options."""
_PAGE_TEMPLATE = 'features/hotlist-details-page.ezt'
- _MAIN_TAB_MODE = flaskservlet.FlaskServlet.HOTLIST_TAB_DETAILS
+ _MAIN_TAB_MODE = servlet.Servlet.HOTLIST_TAB_DETAILS
def AssertBasePermission(self, mr):
super(HotlistDetails, self).AssertBasePermission(mr)
@@ -123,8 +121,8 @@
default_col_spec = post_data['default_col_spec']
return summary, description, name, default_col_spec
- # def GetHotlistDetailsPage(self, **kwargs):
- # return self.handler(**kwargs)
+ def GetHotlistDetailsPage(self, **kwargs):
+ return self.handler(**kwargs)
- # def PostHotlistDetailsPage(self, **kwargs):
- # return self.handler(**kwargs)
+ def PostHotlistDetailsPage(self, **kwargs):
+ return self.handler(**kwargs)