diff --git a/CHANGELOG.md b/CHANGELOG.md index 106d0e6e..68985692 100644 --- 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 index 7b137c65..f43f5927 100644 --- 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 index 63085919..a55c791e 100644 --- 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 index 3c201915..744c7f99 100644 --- 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 index f6c29214..8ee30946 100644 --- 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 new file mode 100644 index 00000000..8c927a6b --- /dev/null +++ b/git-webui/release/share/git-webui/webui/img/discarded.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/module.xml b/module.xml index ea8274fd..0ddd02b1 100644 --- a/module.xml +++ b/module.xml @@ -34,6 +34,7 @@ +