Skip to content
Snippets Groups Projects
Commit c6a194f3 authored by Mart van Santen's avatar Mart van Santen
Browse files

Merge branch 'main' into 119-as-admin-create-recovery-links-from-dashboard

parents f963b365 2a4b38f8
No related branches found
No related tags found
1 merge request!94Resolve "As admin, create recovery links from dashboard"
Pipeline #37620 passed with stages
in 4 minutes and 42 seconds
......@@ -191,15 +191,19 @@ class UserService:
apps = App.query.all()
app_roles = []
for app in apps:
tmp_app_role = AppRole.query.filter_by(
user_id=userId, app_id=app.id
).first()
app_roles.append(
{
"name": app.slug,
"role_id": tmp_app_role.role_id if tmp_app_role else None,
}
)
# Only show role when installed
app_status = app.get_status()
if app_status.installed:
tmp_app_role = AppRole.query.filter_by(
user_id=userId, app_id=app.id
).first()
app_roles.append(
{
"name": app.slug,
"role_id": tmp_app_role.role_id if tmp_app_role else None,
}
)
userRes["traits"]["app_roles"] = app_roles
return userRes
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment