From 80ff5677eacec9271f342525155c250d9245c54c Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 4 Dec 2023 06:40:17 -0800 Subject: [PATCH] Fix: bulk edit object permissions should use permissions object (#4797) --- .../permissions-dialog.component.spec.ts | 11 ++++++++++- .../permissions-dialog.component.ts | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.spec.ts b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.spec.ts index 47f245d0a..3f601d771 100644 --- a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.spec.ts @@ -80,7 +80,16 @@ describe('PermissionsDialogComponent', () => { it('should return permissions', () => { expect(component.permissions).toEqual({ owner: null, - set_permissions: null, + set_permissions: { + view: { + users: [], + groups: [], + }, + change: { + users: [], + groups: [], + }, + }, }) component.form.get('permissions_form').setValue(set_permissions) expect(component.permissions).toEqual(set_permissions) diff --git a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts index 8e5f2321b..e6d5fdb2b 100644 --- a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts +++ b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts @@ -52,8 +52,17 @@ export class PermissionsDialogComponent { get permissions() { return { owner: this.form.get('permissions_form').value?.owner ?? null, - set_permissions: - this.form.get('permissions_form').value?.set_permissions ?? null, + set_permissions: this.form.get('permissions_form').value + ?.set_permissions ?? { + view: { + users: [], + groups: [], + }, + change: { + users: [], + groups: [], + }, + }, } }