Skip to content

Commit e4acf51

Browse files
committed
fix: support CSPInstanceName prefix when used
Also refactors to a single method to return home URL. (From working session/touchpoint.)
1 parent 6dfbd9a commit e4acf51

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

cls/SourceControl/Git/WebUIDriver.cls

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
2323
} elseif $extract(pagePath, 6, *) = "git-version" {
2424
set responseJSON = ..GetGitVersion()
2525
} elseif $extract(pagePath,6,*) = "home"{
26-
set responseJSON = ..GetHomeURL()
26+
set responseJSON = {
27+
"url": (..GetHomeURL())
28+
}
2729
} else {
2830
set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
2931
set responseJSON = {"error":("invalid URI: " _ pagePath)}
@@ -342,10 +344,13 @@ ClassMethod GetGitVersion() As %Library.DynamicObject
342344
quit {"version": (version)}
343345
}
344346

345-
ClassMethod GetHomeURL() As %SystemBase
347+
ClassMethod GetHomeURL() As %String
346348
{
347-
set homeURL = "/csp/sys/UtilHome.csp"
348-
quit {"url": (homeURL)}
349+
set prefix = ""
350+
if $IsObject($Get(%request)) {
351+
set prefix = $Piece(%request.Application,%request.AppMatch)
352+
}
353+
quit prefix_"/csp/sys/UtilHome.csp"
349354
}
350355

351356
}

csp/gitprojectsettings.csp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body {
7676
set version = ##class(SourceControl.Git.Utils).GetPackageVersion()
7777
set webuiURL = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_namespace_"/?CSPSHARE=1"
7878
set webuiURL = ##class(SourceControl.Git.WebUIDriver).GetURLPrefix(%request, webuiURL)
79-
set homeURL = "/csp/sys/UtilHome.csp"
79+
set homeURL = ##class(SourceControl.Git.WebUIDriver).GetHomeURL()
8080

8181
set settings = ##class(SourceControl.Git.Settings).%New()
8282
if $Data(%request.Data("gitsettings",1)) {

0 commit comments

Comments
 (0)