From bdb84cf29741232cea43a33f7b7d60d14fa837b0 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 15 Aug 2023 15:22:06 -0700
Subject: [PATCH] Fixed issue with remove subscriber confirmation message

---
 webroot/js/members.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/webroot/js/members.js b/webroot/js/members.js
index 0a52554..57c0080 100644
--- a/webroot/js/members.js
+++ b/webroot/js/members.js
@@ -79,7 +79,9 @@ export default {
             this.loading = false;
 
         },
-        async removeSubscriber({name, friendlyName}, {id, label}) {
+        async removeSubscriber(group, subscriber) {
+            const {name, friendlyName} = group;
+            const {id, name: subName, label} = subscriber;
             this.loading = true;
             const resp = await fetch(`${this.api.remove}?group=${(name)}&userId=${id}`, {
                 method: "DELETE",
@@ -91,7 +93,7 @@ export default {
             if (resp.ok) {
                 this.subscribers = [];
                 this.loadGroupSubscribers(this.group);
-                generateFlash(`${label} ${this.txt.removeSubscriberSuccess} ${(friendlyName)}`, 'success');
+                generateFlash(`${label || subName} ${this.txt.removeSubscriberSuccess} ${(friendlyName)}`, 'success');
             } else {
                 this.disabled = [ ...this.disabled, id ];
                 generateFlash(this.txt.removeSubscriberError, 'error');
@@ -99,7 +101,8 @@ export default {
 
             this.loading = false;
         },
-        async addSubscriber({ identifier: id, label }) {
+        async addSubscriber(user) {
+            const { identifier: id, label } = user;
             this.loading = true;
             const { friendlyName, name } = this.group;
             const formData = new FormData();