Merge pull request #2608 from microsoft/dev

Issue #2595
microsoft · Jul 21, 2022 · 5ea7b9b · 5ea7b9b
2 parents 8f1a0ed + 6757308
commit 5ea7b9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ContainerHandling/New-NavContainer.ps1 b/ContainerHandling/New-NavContainer.ps1
@@ -1689,7 +1689,12 @@ if ($multitenant) {
         $customNavSettings += @("PublicODataBaseUrl=$restUrl/odata","PublicSOAPBaseUrl=$soapUrl/ws","PublicWebBaseUrl=$webclientUrl")
 
         if ($version.Major -ge 15) {
-            $ServerInstance = "BC"
+            if (Test-Path "$myfolder\serviceSettings.ps1") {
+                . "$myfolder\serviceSettings.ps1"
+            }
+            else {
+                $ServerInstance = "BC"
+            }
         }
         else {
             $ServerInstance = "NAV"

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -9,6 +9,7 @@ Issue #2581 Event log messages show the wrong description
 Issue #2590 UploadImportAndApply-ConfigPackageInBcContainer ignores tenant parameter
 Issue #2591 Performance issue with Get-NavContainerAppInfo
 Issue #2587 Run-ALPipeline with App Name Change
+Partial fix for Issue #2595 (Issues with "Edit in Excel" for container behind traefik)
 
 3.0.11
 Issue #2378 When running BcContainerHelper without admin rights, the import of a certificate is now done in an elevated process (asking for permissions)