Skip to content

Fix adding favorites links on newer IRIS versions #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2025
Merged

Fix adding favorites links on newer IRIS versions #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d59d491
fix: adding favorites on newest IRIS versions that have %List data ty…
isc-pbarton Apr 8, 2025
1e79a74
fix: GitHub actions after IPM rename
isc-pbarton Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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... "
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3178,3 +3177,4 @@ ClassMethod GitUnstage(Output output As %Library.DynamicObject) As %Status
}

}

Loading