Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/projectadminadvanced.py b/project/projectadminadvanced.py
index eafe912..dff718a 100644
--- a/project/projectadminadvanced.py
+++ b/project/projectadminadvanced.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.
"""Page and form handlers for project administration "advanced" subtab.
@@ -22,14 +21,13 @@
import ezt
from businesslogic import work_env
-from framework import flaskservlet
from framework import framework_constants
from framework import framework_helpers
from framework import permissions
from framework import servlet
from framework import template_helpers
from framework import urls
-from proto import project_pb2
+from mrproto import project_pb2
from tracker import tracker_constants
@@ -37,7 +35,7 @@
"""A page with project state options for the Project Owner(s)."""
_PAGE_TEMPLATE = 'project/project-admin-advanced-page.ezt'
- _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ADMIN
+ _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ADMIN
def AssertBasePermission(self, mr):
"""Make sure that the logged in user has permission to view this page.
@@ -212,8 +210,8 @@
moved_to = post_data.get('moved_to', '')
we.UpdateProject(mr.project.project_id, moved_to=moved_to)
- # def GetProjectAdminAdvancedPage(self, **kwargs):
- # return self.handler(**kwargs)
+ def GetProjectAdminAdvancedPage(self, **kwargs):
+ return self.handler(**kwargs)
- # def PostProjectAdminAdvancedPage(self, **kwargs):
- # return self.handler(**kwargs)
\ No newline at end of file
+ def PostProjectAdminAdvancedPage(self, **kwargs):
+ return self.handler(**kwargs)