Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/project/peopledetail.py b/project/peopledetail.py
index 3c4846b..af9cd49 100644
--- a/project/peopledetail.py
+++ b/project/peopledetail.py
@@ -14,10 +14,10 @@
import ezt
from framework import exceptions
+from framework import flaskservlet
from framework import framework_bizobj
from framework import framework_helpers
from framework import framework_views
-from framework import jsonfeed
from framework import permissions
from framework import servlet
from framework import template_helpers
@@ -39,7 +39,6 @@
permissions.DELETE_OWN,
permissions.DELETE_ANY,
permissions.EDIT_ANY_MEMBER_NOTES,
- permissions.MODERATE_SPAM,
]
@@ -47,7 +46,7 @@
"""People detail page documents one partipant's involvement in a project."""
_PAGE_TEMPLATE = 'project/people-detail-page.ezt'
- _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_PEOPLE
+ _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_PEOPLE
def AssertBasePermission(self, mr):
"""Check that the user is allowed to access this servlet."""
@@ -234,6 +233,8 @@
role = post_data.get('role', '').lower()
extra_perms = []
+ # TODO(crbug.com/monorail/10936): getall in Flask is getlist
+ # for ep in post_data.getlist('extra_perms'):
for ep in post_data.getall('extra_perms'):
perm = framework_bizobj.CanonicalizeLabel(ep)
# Perms with leading underscores are reserved.
@@ -269,3 +270,9 @@
self.services.project.UpdateProjectRoles(
cnxn, project.project_id, owner_ids, committer_ids, contributor_ids)
+
+ # def GetPeopleDetailPage(self, **kwargs):
+ # return self.handler(**kwargs)
+
+ # def PostPeopleDetailPage(self, **kwargs):
+ # return self.handler(**kwargs)