From 1127587dd29997b56d08a74ecc5229f371b315ce Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 12 Mar 2024 09:18:54 +0100 Subject: [PATCH] [Minor] Fixed wrong detection of new APP version --- .../src/main/webapp/app/src/main/c-main.html | 2 +- .../src/main/webapp/app/src/main/c-main.html | 2 +- .../src/main/webapp/app/src/main/c-main.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-main.html b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-main.html index c4845cc..ad80311 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-main.html +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-main.html @@ -211,7 +211,7 @@ || scmRevision === 'undefined') { sessionStorage.appScmRevision = scmRevision; console.log("App SCM Revision is now known as " + scmRevision); - } else if (scmRevision !== currentVersion) { + } else if (scmRevision !== undefined && scmRevision !== currentVersion) { console.log("App SCM Revision has changed from " + currentVersion + " to " + scmRevision + ". Need to refresh browser..."); this.fire("strolch-app-version-outdated", {newVersion: scmRevision}); diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-main.html b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-main.html index c4845cc..ad80311 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-main.html +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-main.html @@ -211,7 +211,7 @@ || scmRevision === 'undefined') { sessionStorage.appScmRevision = scmRevision; console.log("App SCM Revision is now known as " + scmRevision); - } else if (scmRevision !== currentVersion) { + } else if (scmRevision !== undefined && scmRevision !== currentVersion) { console.log("App SCM Revision has changed from " + currentVersion + " to " + scmRevision + ". Need to refresh browser..."); this.fire("strolch-app-version-outdated", {newVersion: scmRevision}); diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-main.html b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-main.html index c4845cc..ad80311 100644 --- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-main.html +++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-main.html @@ -211,7 +211,7 @@ || scmRevision === 'undefined') { sessionStorage.appScmRevision = scmRevision; console.log("App SCM Revision is now known as " + scmRevision); - } else if (scmRevision !== currentVersion) { + } else if (scmRevision !== undefined && scmRevision !== currentVersion) { console.log("App SCM Revision has changed from " + currentVersion + " to " + scmRevision + ". Need to refresh browser..."); this.fire("strolch-app-version-outdated", {newVersion: scmRevision});