Merge branch 'master' into develop

2022-01-21 10:02:47 +01:00
parent 637da2dbd7 da4db76f15
commit c2087179d0
6 changed files with 14 additions and 5 deletions
@@ -2,7 +2,7 @@

 	<PropertyGroup>
 		<TargetFramework>net5.0</TargetFramework>
-		<Version>1.0.2201.2109</Version>
+		<Version>1.0.2201.2110</Version>
 		<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
@@ -298,6 +298,15 @@ namespace GWMS.UI.Pages
                    }

                    string baseUrl = Configuration["BaseUrl"];
+                    string baseAppPath = Configuration["BaseAppPath"];
+                    if (!string.IsNullOrEmpty(baseAppPath))
+                    {
+                        if (baseUrl.EndsWith("/"))
+                        {
+                            baseUrl = baseUrl.Substring(0, baseUrl.Length - 1);
+                        }
+                        baseUrl = $"{baseUrl}{baseAppPath}";
+                    }
                    qrCodeVal = $"{baseUrl}Identity/Account/LogIn?uid={user.Id}&uem={user.Email}&pag=Transporters";
                }
            });
@@ -37,7 +37,7 @@
  "ZCodeUrl": "https://qrcode.steamware.net/",
  "ChartWaitDelay": 10,
  "BaseUrl": "https://localhost:44339/",
-  "BaseAppPath": "",
+  "BaseAppPath": "/pizzaferri/",
  "jumpRedir": "~/../../",
  "logo": "img/LogoPizzaferri.jpg",
  "ReloadParamTimer": 15000,
@@ -1,6 +1,6 @@
 <body>
    <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2201.2109</h4>
+    <h4>Versione: 1.0.2201.2110</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-1.0.2201.2109
+1.0.2201.2110
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2201.2109</version>
+  <version>1.0.2201.2110</version>
  <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
  <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
  <mandatory>false</mandatory>