intersystems · isc-hwojnick · Aug 16, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 15, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - New UI for the basic mode Sync (#415)
 
+### Fixed
+- Instance wide settings are placed in proper global (#444)
+
 ## [2.4.1] - 2024-08-02
 
 ### Added

diff --git a/cls/SourceControl/Git/Change.cls b/cls/SourceControl/Git/Change.cls
@@ -237,4 +237,3 @@ Storage Default
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Extension.cls b/cls/SourceControl/Git/Extension.cls
@@ -403,4 +403,3 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -18,7 +18,7 @@ Parameter GitContextMenuItems = ",%Diff,%Blame,";
 
 ClassMethod %SYSNamespaceStorage() As %String [ CodeMode = expression ]
 {
-$Replace(..#Storage,"^","^["""_..#InstallNamespace_"""]")
+$Replace(..#Storage,"^SYS","^%SYS")
 }
 
 /// Returns root temp folder
@@ -183,6 +183,14 @@ ClassMethod IsImportAfter(menuItemName As %String) As %Boolean [ CodeMode = expr
 $Find(..#ImportAfterGitMenuItems, ","_menuItemName_",") > 0
 }
 
+ClassMethod MigrateInstanceSettings()
+{
+    if $data(^["%SYS"]SYS("SourceControl", "Git")) {
+        merge ^%SYS("SourceControl", "Git") = ^["%SYS"]SYS("SourceControl", "Git")
+        kill ^["%SYS"]SYS("SourceControl", "Git")
+    }
+}
+
 ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Target As %String, ByRef Action As %String, ByRef Reload As %Boolean, ByRef Msg As %String) As %Status
 {
     #define Force 1
@@ -2563,4 +2571,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
@@ -269,4 +269,3 @@ ClassMethod GetPackageVersion() As %Library.DynamicObject
 }
 
 }
-
diff --git a/git-webui/release/share/git-webui/webui/img/discarded.svg b/git-webui/release/share/git-webui/webui/img/discarded.svg
diff --git a/module.xml b/module.xml
@@ -34,6 +34,7 @@
       <Invoke Class="SourceControl.Git.Utils" Method="Localize" />
       <Invoke Class="SourceControl.Git.Utils" Method="ConfigureWeb" />
       <Invoke Class="SourceControl.Git.Utils" Method="CheckInitialization" />
+      <Invoke Class="SourceControl.Git.Utils" Method="MigrateInstanceSettings" />
 
       <Invoke Class="SourceControl.Git.Utils" Method="ResetSourceControlClass" Phase="Unconfigure" />
     </Module>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -403,4 +403,3 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")
		}

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -269,4 +269,3 @@ ClassMethod GetPackageVersion() As %Library.DynamicObject
		}

		}