Skip to content

Commit

Permalink
Merge pull request #117 from intersystems-community/master
Browse files Browse the repository at this point in the history
update stage
  • Loading branch information
nsolov authored Sep 5, 2024
2 parents 5617543 + ed7b5b1 commit ff52a5f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/bump-module-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
branches:
- master
- main
release:
types:
- released

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Name>zpm-registry</Name>
<ExternalName>ZPM Registry</ExternalName>
<Description>Registry server for ZPM</Description>
<Version>1.3.0</Version>
<Version>1.3.2</Version>
<Packaging>module</Packaging>
<Dependencies>
<ModuleReference>
Expand Down
4 changes: 2 additions & 2 deletions src/cls/ZPM/Package.cls
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ Method versionsGet() As %ListOfDataTypes
Set tList = ##class(%ListOfDataTypes).%New()

Set name = ..name
Set tPrerelease = $Select($Data(%request) # 2: %request.Get("includePrerelease", 0), 1: 1)
Set tSnapshot = $Select($Data(%request) # 2: %request.Get("includeSnapshots", 0), 1: 1)
Set tPrerelease = $Select($Data(%request) # 2: %request.Get("includePrerelease", 1), 1: 1)
Set tSnapshot = $Select($Data(%request) # 2: %request.Get("includeSnapshots", 1), 1: 1)
&sql(
SELECT %DLIST(version) INTO :versions
FROM Package
Expand Down
4 changes: 2 additions & 2 deletions src/cls/ZPM/Registry.cls
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ ClassMethod Package(pkg As %String = "", version As %String = "", platformVersio
If (version="") {
$$$ThrowOnError(##class(ZPM.UpLink).FindPackageInAllUpLinks(pkg))
}
Set tIncludePrerelease = %request.Get("includePrerelease", 0)
Set tIncludeSnapshots = %request.Get("includeSnapshots", 0)
Set tIncludePrerelease = %request.Get("includePrerelease", 1)
Set tIncludeSnapshots = %request.Get("includeSnapshots", 1)

Set version = ##class(ZPM.Package).VersionFind(pkg, version, tIncludePrerelease, tIncludeSnapshots)
If (version = "") {
Expand Down

0 comments on commit ff52a5f

Please sign in to comment.