Skip to content

Commit 50c83a4

Browse files
authored
Merge pull request #737 from intersystems/fix-favorites
Fix adding favorites links on newer IRIS versions
2 parents c71bab2 + 1e79a74 commit 50c83a4

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Produce CE Artifact
8484
run: |
85-
echo "set version=##class(%ZPM.PackageManager.Developer.Module).NameOpen(\"git-source-control\").VersionString" > package.script
85+
echo "set version=##class(%IPM.Storage.Module).NameOpen(\"git-source-control\").VersionString" > package.script
8686
echo "set file=\"/$artifact_dir/git-source-control-\"_version_\".xml\" write !,file,!" >> package.script
8787
echo "do ##class(SourceControl.Git.Utils).BuildCEInstallationPackage(file)" >> package.script
8888
echo "halt" >> package.script

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Pull event handler that does an IPM uninstall and load to handle deletes (#631)
1212
- Partial support for production decomposition with the new interoperability editors
1313

14+
### Fixed
15+
- Favorites links for Git pages now works on recent IRIS versions (#734)
16+
1417
## [2.10.0] - 2025-02-10
1518

1619
### Added

cls/SourceControl/Git/Utils.cls

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,7 +2681,7 @@ ClassMethod ConfigureWeb()
26812681
set $Namespace = "%SYS"
26822682
write !,"Adding favorites for all users:"
26832683
set sql = "insert or update into %SYS_Portal.Users (Username, Page, Data) "_
2684-
"select ID,?,? from Security.Users"
2684+
"select ID,?,$LISTBUILD(?) from Security.Users"
26852685
set caption = "Git: "_installNamespace
26862686
set link = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_installNamespace_"/"
26872687
write !,"Adding Git favorite... "
@@ -2890,11 +2890,10 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
28902890
$$$ThrowOnError(project.AddItem(key_".CLS"))
28912891
}
28922892
$$$ThrowOnError(project.AddItem("SourceControl.Git.INC"))
2893-
$$$ThrowOnError(project.AddItem("%ZPM.PackageManager.Core.Singleton.CLS"))
28942893

28952894
// /isc/studio/usertemplates project
28962895
set sourcedir = ##class(%Library.File).NormalizeDirectory($$$sourcedir)
2897-
set archive = ##class(%ZPM.PackageManager.Core.XDataArchive).%New(sourcedir)
2896+
set archive = ##class(%IPM.Lifecycle.StudioProject.XDataArchive).%New(sourcedir)
28982897
do archive.AddToProject(project)
28992898

29002899
kill $$$exportGBL
@@ -3178,3 +3177,4 @@ ClassMethod GitUnstage(Output output As %Library.DynamicObject) As %Status
31783177
}
31793178

31803179
}
3180+

0 commit comments

Comments
 (0)