diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8990ca37..fcdba529 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: - name: Produce CE Artifact run: | - echo "set version=##class(%ZPM.PackageManager.Developer.Module).NameOpen(\"git-source-control\").VersionString" > package.script + echo "set version=##class(%IPM.Storage.Module).NameOpen(\"git-source-control\").VersionString" > package.script echo "set file=\"/$artifact_dir/git-source-control-\"_version_\".xml\" write !,file,!" >> package.script echo "do ##class(SourceControl.Git.Utils).BuildCEInstallationPackage(file)" >> package.script echo "halt" >> package.script diff --git a/CHANGELOG.md b/CHANGELOG.md index c22c866a..691a923c 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 - Pull event handler that does an IPM uninstall and load to handle deletes (#631) - Partial support for production decomposition with the new interoperability editors +### Fixed +- Favorites links for Git pages now works on recent IRIS versions (#734) + ## [2.10.0] - 2025-02-10 ### Added diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index c09625fb..0c9b22d1 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -2681,7 +2681,7 @@ ClassMethod ConfigureWeb() set $Namespace = "%SYS" write !,"Adding favorites for all users:" set sql = "insert or update into %SYS_Portal.Users (Username, Page, Data) "_ - "select ID,?,? from Security.Users" + "select ID,?,$LISTBUILD(?) from Security.Users" set caption = "Git: "_installNamespace set link = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_installNamespace_"/" write !,"Adding Git favorite... " @@ -2890,11 +2890,10 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status $$$ThrowOnError(project.AddItem(key_".CLS")) } $$$ThrowOnError(project.AddItem("SourceControl.Git.INC")) - $$$ThrowOnError(project.AddItem("%ZPM.PackageManager.Core.Singleton.CLS")) // /isc/studio/usertemplates project set sourcedir = ##class(%Library.File).NormalizeDirectory($$$sourcedir) - set archive = ##class(%ZPM.PackageManager.Core.XDataArchive).%New(sourcedir) + set archive = ##class(%IPM.Lifecycle.StudioProject.XDataArchive).%New(sourcedir) do archive.AddToProject(project) kill $$$exportGBL @@ -3178,3 +3177,4 @@ ClassMethod GitUnstage(Output output As %Library.DynamicObject) As %Status } } +