From 280fab41a1441290fe06199cf5d329e6b49fb037 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 15 Apr 2024 15:50:29 +0200 Subject: [PATCH 1/2] IBX-8075: Fix UDW crashing when trying to change previous user group selection --- .../admin/user/role_assignment/create.html.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig index 415732aa15..b12f7b305b 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig @@ -34,9 +34,9 @@ id: user.content.versionInfo.contentInfo.id, name: ibexa_content_name(user) }) %} - {% set items_map = form.users.vars.data|reduce((output, user) => output|merge({ - "{{user.content.versionInfo.contentInfo.id}}": user.id - }), {}) %} + {% set items_map = form.users.vars.data|reduce((output, user) => output + { + (user.content.versionInfo.contentInfo.id): user.id, + }, {}) %} {% set users_udw_title = "role_assignment.view.add.panel.users_and_groups.users.udw_title" |trans({}, 'ibexa_role') |desc("Select Users to assign to the Role") %} @@ -66,9 +66,9 @@ id: group.content.versionInfo.contentInfo.id, name: ibexa_content_name(group.content) }) %} - {% set items_map = form.groups.vars.data|reduce((output, group) => output|merge({ - "{{group.content.versionInfo.contentInfo.i}}": group.id - }), {}) %} + {% set items_map = form.groups.vars.data|reduce((output, group) => output + { + (group.id): group.content.versionInfo.contentInfo.mainLocationId, + }, {}) %} {% set groups_udw_title = "role_assignment.view.add.panel.users_and_groups.groups.udw_title" |trans({}, 'ibexa_role') |desc("Select User Groups to assign to the Role") %} From 234ccd0ed961abd5259a031d06b53b768bb29ef1 Mon Sep 17 00:00:00 2001 From: tischsoic Date: Mon, 15 Apr 2024 16:31:32 +0200 Subject: [PATCH 2/2] fix for users --- .../views/themes/admin/user/role_assignment/create.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig index b12f7b305b..03ff01eeaa 100644 --- a/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role_assignment/create.html.twig @@ -35,7 +35,7 @@ name: ibexa_content_name(user) }) %} {% set items_map = form.users.vars.data|reduce((output, user) => output + { - (user.content.versionInfo.contentInfo.id): user.id, + (user.id): user.content.versionInfo.contentInfo.mainLocationId, }, {}) %} {% set users_udw_title = "role_assignment.view.add.panel.users_and_groups.users.udw_title" |trans({}, 'ibexa_role')