Loading lib/galaxy/webapps/galaxy/services/roles.py +12 −2 Original line number Diff line number Diff line from typing import Optional from galaxy.managers.context import ProvidesUserContext from galaxy.managers.roles import RoleManager from galaxy.model.db.role import get_private_role_user_emails_dict from galaxy.schema.fields import ( DecodedDatabaseIdField, Security, Loading @@ -14,10 +17,12 @@ from galaxy.webapps.base.controller import url_for from galaxy.webapps.galaxy.services.base import ServiceBase def role_to_model(role): def role_to_model(role, displayed_name: Optional[str] = None): item = role.to_dict(view="element") role_id = Security.security.encode_id(role.id) item["url"] = url_for("role", id=role_id) if displayed_name: item["displayed_name"] = displayed_name return RoleModelResponse(**item) Loading @@ -33,7 +38,12 @@ class RolesService(ServiceBase): def get_index(self, trans: ProvidesUserContext) -> RoleListResponse: roles = self.role_manager.list_displayable_roles(trans) return RoleListResponse(root=[role_to_model(r) for r in roles]) private_role_emails = get_private_role_user_emails_dict(trans.sa_session) data = [] for role in roles: displayed_name = private_role_emails.get(role.id, role.name) data.append(role_to_model(role, displayed_name)) return RoleListResponse(root=data) def show(self, trans: ProvidesUserContext, id: DecodedDatabaseIdField) -> RoleModelResponse: role = self.role_manager.get(trans, id) Loading Loading
lib/galaxy/webapps/galaxy/services/roles.py +12 −2 Original line number Diff line number Diff line from typing import Optional from galaxy.managers.context import ProvidesUserContext from galaxy.managers.roles import RoleManager from galaxy.model.db.role import get_private_role_user_emails_dict from galaxy.schema.fields import ( DecodedDatabaseIdField, Security, Loading @@ -14,10 +17,12 @@ from galaxy.webapps.base.controller import url_for from galaxy.webapps.galaxy.services.base import ServiceBase def role_to_model(role): def role_to_model(role, displayed_name: Optional[str] = None): item = role.to_dict(view="element") role_id = Security.security.encode_id(role.id) item["url"] = url_for("role", id=role_id) if displayed_name: item["displayed_name"] = displayed_name return RoleModelResponse(**item) Loading @@ -33,7 +38,12 @@ class RolesService(ServiceBase): def get_index(self, trans: ProvidesUserContext) -> RoleListResponse: roles = self.role_manager.list_displayable_roles(trans) return RoleListResponse(root=[role_to_model(r) for r in roles]) private_role_emails = get_private_role_user_emails_dict(trans.sa_session) data = [] for role in roles: displayed_name = private_role_emails.get(role.id, role.name) data.append(role_to_model(role, displayed_name)) return RoleListResponse(root=data) def show(self, trans: ProvidesUserContext, id: DecodedDatabaseIdField) -> RoleModelResponse: role = self.role_manager.get(trans, id) Loading