From ffef985690e002cb6732d36c9768a4b8fd49badb Mon Sep 17 00:00:00 2001 From: Daniel Ponte Date: Tue, 26 Nov 2024 11:00:54 -0500 Subject: [PATCH 1/2] Fix icon metadata --- .../talkgroup-record/talkgroup-record.component.ts | 6 +++--- client/admin/src/app/talkgroups/talkgroups.component.html | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/admin/src/app/talkgroups/talkgroup-record/talkgroup-record.component.ts b/client/admin/src/app/talkgroups/talkgroup-record/talkgroup-record.component.ts index 925d5db..23536a0 100644 --- a/client/admin/src/app/talkgroups/talkgroup-record/talkgroup-record.component.ts +++ b/client/admin/src/app/talkgroups/talkgroup-record/talkgroup-record.component.ts @@ -54,7 +54,6 @@ export class TalkgroupRecordComponent { weight: new FormControl(this.tg.weight), icon: new FormControl(this.tg.icon), }); - console.log(this.tg.icon); }); } @@ -83,14 +82,15 @@ export class TalkgroupRecordComponent { tgu.weight = Number(this.form.controls['weight'].value); } if (this.form.controls['icon'].dirty) { + let iv: string = this.form.controls['icon'].value; if (tgu.metadata == null) { tgu.metadata = {}; } - if (this.tg.icon == null || this.tg.icon == '') { + if (iv == '') { tgu.metadata = Object.assign(tgu.metadata, { icon: undefined }); } else { tgu.metadata = Object.assign(tgu.metadata!, { - icon: this.form.controls['icon'], + icon: iv, }); } } diff --git a/client/admin/src/app/talkgroups/talkgroups.component.html b/client/admin/src/app/talkgroups/talkgroups.component.html index 5849924..3b8ba75 100644 --- a/client/admin/src/app/talkgroups/talkgroups.component.html +++ b/client/admin/src/app/talkgroups/talkgroups.component.html @@ -1,5 +1,4 @@
- Import
+ +Import \ No newline at end of file -- 2.48.1 From 3f3c0bd00b94cac07f44a860766a994840985393 Mon Sep 17 00:00:00 2001 From: Daniel Ponte Date: Sun, 1 Dec 2024 20:43:14 -0500 Subject: [PATCH 2/2] wip --- client/admin/src/app/app.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/admin/src/app/app.component.html b/client/admin/src/app/app.component.html index fedb1d5..928cd41 100644 --- a/client/admin/src/app/app.component.html +++ b/client/admin/src/app/app.component.html @@ -260,7 +260,7 @@ @if (auth.loggedIn) {
-- 2.48.1