Skip to content

Commit 33ed837

Browse files
authored
Merge pull request #363 from intersystems/show-package-version
Issue #360 package version shows on settings and main webui page
2 parents 0f10859 + d52c091 commit 33ed837

File tree

8 files changed

+52
-9558
lines changed

8 files changed

+52
-9558
lines changed

cls/SourceControl/Git/Utils.cls

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,6 +1952,13 @@ ClassMethod CheckInitialization()
19521952
}
19531953
}
19541954

1955+
ClassMethod GetPackageVersion() As %String
1956+
{
1957+
do ##class(%ZPM.PackageManager).GetVersion("git-source-control",.out)
1958+
set scVersion = out("git-source-control")
1959+
quit $LIST(scVersion, 2)
1960+
}
1961+
19551962
ClassMethod GetSourceControlInclude() As %String
19561963
{
19571964
quit $select(##class(%Library.EnsembleMgr).IsEnsembleInstalled():

cls/SourceControl/Git/WebUIDriver.cls

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
1818
set responseJSON = ..Uncommitted()
1919
} elseif $extract(pagePath,6,*) = "settings" {
2020
set responseJSON = ..GetSettingsURL(%request)
21+
} elseif $extract(pagePath, 6, *) = "get-package-version"{
22+
set responseJSON = ..GetPackageVersion()
2123
} else {
2224
set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
2325
set responseJSON = {"error":("invalid URI: " _ pagePath)}
@@ -224,4 +226,11 @@ ClassMethod GetSettingsURL(%request As %CSP.Request) As %SystemBase
224226
quit {"url": (settingsURL)}
225227
}
226228

229+
ClassMethod GetPackageVersion() As %Library.DynamicObject
230+
{
231+
set version = ##class(SourceControl.Git.Utils).GetPackageVersion()
232+
quit {"version": (version)}
233+
}
234+
227235
}
236+

csp/gitprojectsettings.csp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ body {
6262
<body>
6363
<server>
6464
set namespace = $namespace
65+
set version = ##class(SourceControl.Git.Utils).GetPackageVersion()
6566
set webuiURL = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_namespace_"/?CSPSHARE=1"
6667
set webuiURL = ##class(SourceControl.Git.WebUIDriver).GetURLPrefix(%request, webuiURL)
6768

@@ -105,7 +106,9 @@ body {
105106
<div class="row">
106107
<div class="offset-sm-1 col-sm-8">
107108
<h1>Git Project Settings</h1>
109+
<h3> Package version: #(version)# </h3>
108110
</div>
111+
109112
<div class="col-sm-2">
110113
<button class="btn btn-lg btn-outline-dark" id="goToWebUI">Go to WebUI
111114
</button>

0 commit comments

Comments
 (0)