From ee5b88e19a159d1dbcf1553ac9065961133294db Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 23 Dec 2024 15:07:09 +0700 Subject: [PATCH 1/3] Backport: fix interface labels are not persistant --- src/app/services/mapsettings.service.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/app/services/mapsettings.service.ts b/src/app/services/mapsettings.service.ts index ce5870db..ac4d2b7e 100644 --- a/src/app/services/mapsettings.service.ts +++ b/src/app/services/mapsettings.service.ts @@ -31,6 +31,11 @@ export class MapSettingsService { } else { localStorage.setItem('symbolScaling', 'true'); } + if (localStorage.getItem('showInterfaceLabels')) { + this.showInterfaceLabels = localStorage.getItem('showInterfaceLabels') === 'true' ? true : false; + } else { + localStorage.setItem('showInterfaceLabels', 'true'); + } } public getSymbolScaling(): boolean { @@ -72,6 +77,12 @@ export class MapSettingsService { toggleShowInterfaceLabels(value: boolean) { this.showInterfaceLabels = value; + localStorage.removeItem('showInterfaceLabels'); + if (value) { + localStorage.setItem('showInterfaceLabels', 'true'); + } else { + localStorage.setItem('showInterfaceLabels', 'false'); + } } toggleIntegrateInterfaceLabels(value: boolean) { From 2a9ced5cbd7ee0292dcd45f23e2be656eeac6778 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 30 Dec 2024 16:26:51 +0700 Subject: [PATCH 2/3] Allow ':' in project names. Fixes https://github.com/GNS3/gns3-gui/issues/3686 --- src/app/components/projects/models/projectNameValidator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/projects/models/projectNameValidator.ts b/src/app/components/projects/models/projectNameValidator.ts index 6bf3efc3..cc6b72b8 100644 --- a/src/app/components/projects/models/projectNameValidator.ts +++ b/src/app/components/projects/models/projectNameValidator.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; @Injectable() export class ProjectNameValidator { get(projectName) { - var pattern = new RegExp(/[~`!#$%\^&*+=\[\]\\';,/{}|\\":<>\?]/); + var pattern = new RegExp(/[~`!#$%\^&*+=\[\]\\';,/{}|\\"<>\?]/); if (!pattern.test(projectName.value)) { return null; From 84169a2c1ed5fe8eaec6946f0caf77d21e380d34 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 27 Dec 2024 23:57:23 +1000 Subject: [PATCH 3/3] Add missing checkImageFromVersion() for IOS and IOU --- .../new-template-dialog.component.html | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html index 6f00730e..dfa40546 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html @@ -170,7 +170,7 @@
- Install required files + Install the required files
- Install required files + Install the required images