From 86d223fd932fa7448c9663643b7a54bb4de91163 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 22 Sep 2023 01:20:25 -0700
Subject: [PATCH] Fix mixed rule / owner check, component input / output

---
 .../common/permissions-dialog/permissions-dialog.component.ts | 4 ++++
 .../app/components/manage/settings/settings.component.html    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 2bdc8d49d..b3aa6d2df 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
@@ -21,10 +21,13 @@ export class PermissionsDialogComponent {
     this.userService.listAll().subscribe((r) => (this.users = r.results))
   }
 
+  @Output()
   public confirmClicked = new EventEmitter()
 
+  @Input()
   title = $localize`Set permissions`
 
+  @Input()
   set object(o: ObjectWithPermissions) {
     this.o = o
     this.title = $localize`Edit permissions for ` + o['name']
@@ -54,6 +57,7 @@ export class PermissionsDialogComponent {
     }
   }
 
+  @Input()
   message = $localize`Note that permissions set here will override any existing permissions`
 
   cancelClicked() {
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index bdf30f8d9..e2e4ed5c5 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -343,7 +343,7 @@
                     <div class="col">
                       <div class="btn-group">
                         <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.MailAccount }" [disabled]="!userCanEdit(account)" class="btn btn-sm btn-primary" type="button" (click)="editMailAccount(account)" i18n>Edit</button>
-                        <button *pngxIfOwner="rule" class="btn btn-sm btn-primary" type="button" (click)="editPermissions(account)" i18n>Permissions</button>
+                        <button *pngxIfOwner="account" class="btn btn-sm btn-primary" type="button" (click)="editPermissions(account)" i18n>Permissions</button>
                         <button *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.MailAccount }" [disabled]="!userIsOwner(account)" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteMailAccount(account)" i18n>Delete</button>
                       </div>
                     </div>