From c0b0c6b4b598acd7a867594d91b7f7cff47d2e5e Mon Sep 17 00:00:00 2001 From: Serhii Tsymbaliuk Date: Mon, 18 Nov 2019 12:42:52 +0100 Subject: [PATCH] WebUI: Fix adding member manager for groups and host groups - fix API method call for adding member manager - fix regressions in host group associated tables Ticket: https://pagure.io/freeipa/issue/8123 Signed-off-by: Serhii Tsymbaliuk Reviewed-By: Christian Heimes --- install/ui/src/freeipa/group.js | 6 ++++-- install/ui/src/freeipa/hostgroup.js | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js index 1a4352431..e46d8c7e3 100644 --- a/install/ui/src/freeipa/group.js +++ b/install/ui/src/freeipa/group.js @@ -154,14 +154,16 @@ return { { $type: 'association', name: 'membermanager_group', - associator: IPA.serial_associator, + add_method: 'add_member_manager', + remove_method: 'remove_member_manager', add_title: '@i18n:objects.group.add_membermanager_group', remove_title: '@i18n:objects.group.remove_membermanager_group' }, { $type: 'association', name: 'membermanager_user', - associator: IPA.serial_associator, + add_method: 'add_member_manager', + remove_method: 'remove_member_manager', add_title: '@i18n:objects.group.add_membermanager_user', remove_title: '@i18n:objects.group.remove_membermanager_user' }, diff --git a/install/ui/src/freeipa/hostgroup.js b/install/ui/src/freeipa/hostgroup.js index 763605194..7bbaf8faa 100644 --- a/install/ui/src/freeipa/hostgroup.js +++ b/install/ui/src/freeipa/hostgroup.js @@ -66,28 +66,28 @@ return { { $type: 'association', name: 'membermanager_group', - associator: IPA.serial_associator, + add_method: 'add_member_manager', + remove_method: 'remove_member_manager', add_title: '@i18n:objects.hostgroup.add_membermanager_group', remove_title: '@i18n:objects.hostgroup.remove_membermanager_group' }, { $type: 'association', name: 'membermanager_user', - associator: IPA.serial_associator, + add_method: 'add_member_manager', + remove_method: 'remove_member_manager', add_title: '@i18n:objects.hostgroup.add_membermanager_user', remove_title: '@i18n:objects.hostgroup.remove_membermanager_user' }, { $type: 'association', name: 'member_host', - associator: IPA.serial_associator, add_title: '@i18n:objects.hostgroup.add_hosts', remove_title: '@i18n:objects.hostgroup.remove_hosts' }, { $type: 'association', name: 'member_hostgroup', - associator: IPA.serial_associator, add_title: '@i18n:objects.hostgroup.add_hostgroups', remove_title: '@i18n:objects.hostgroup.remove_hostgroups' },