Merge pull request #460 from intersystems/instance-settings-global

isc-hwojnick · web-flow · commit b700b2c8146a · 2024-08-16T10:27:33.000-04:00
resolved issue with instance wide settings being in protected global
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
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#eee"><path d="m366-589 86-144-43-72q-14-23-41.5-23T326-805l-84 141 124 75Zm380 253-87-144 125-72 65 107q10 16 10.5 34t-7.5 35q-9 19-26.5 29.5T787-336h-41ZM624-74 480-218l144-144v74h184l-52 104q-10 18-27.5 29T691-144h-67v70Zm-362-70q-17 0-32-9t-23-25q-7-14-6-29t9-29l31-52h167v144H262Zm-95-115-59-117q-8-17-7-35t10-34l20-34-62-37 198-49 49 198-62-37-87 145Zm518-319-198-50 62-37-119-199h127q19 0 35 9.5t26 25.5l54 90 62-37-49 198Z"/></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
`@@ -237,4 +237,3 @@ Storage Default`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`}`
`240`		`-`
Original file line number	Diff line number	Diff line change
`@@ -403,4 +403,3 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`}`
`406`		`-`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ Parameter GitContextMenuItems = ",%Diff,%Blame,";`
`18`	`18`
`19`	`19`	`ClassMethod %SYSNamespaceStorage() As %String [ CodeMode = expression ]`
`20`	`20`	`{`
`21`		`-$Replace(..#Storage,"^","^["""_..#InstallNamespace_"""]")`
	`21`	`+$Replace(..#Storage,"^SYS","^%SYS")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// Returns root temp folder`
`@@ -183,6 +183,14 @@ ClassMethod IsImportAfter(menuItemName As %String) As %Boolean [ CodeMode = expr`
`183`	`183`	`$Find(..#ImportAfterGitMenuItems, ","_menuItemName_",") > 0`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ClassMethod MigrateInstanceSettings()`
	`187`	`+{`
	`188`	`+ if $data(^["%SYS"]SYS("SourceControl", "Git")) {`
	`189`	`+ merge ^%SYS("SourceControl", "Git") = ^["%SYS"]SYS("SourceControl", "Git")`
	`190`	`+ kill ^["%SYS"]SYS("SourceControl", "Git")`
	`191`	`+ }`
	`192`	`+}`
	`193`	`+`
`186`	`194`	`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`
`187`	`195`	`{`
`188`	`196`	`#define Force 1`
`@@ -2563,4 +2571,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status`
`2563`	`2571`	`}`
`2564`	`2572`
`2565`	`2573`	`}`
`2566`		`-`
Original file line number	Diff line number	Diff line change
`@@ -269,4 +269,3 @@ ClassMethod GetPackageVersion() As %Library.DynamicObject`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`}`
`272`		`-`