Consistently use Namespace instead of NSpace

isc-tleavitt · isc-tleavitt · commit 062d5d5c3b5b · 2023-01-24T10:09:32.000-05:00
This "just works" thanks to %CSP.StudioTemplateSuper.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - Unreleased
+
+### Fixed
+- Link from WebUI to Settings page works properly (#230)
+
 ## [2.1.0] - 2023-01-23
 
 ### Added
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
@@ -212,7 +212,7 @@ ClassMethod GetURLPrefix(%request As %CSP.Request, URL As %String) As %String
 
 ClassMethod GetSettingsURL(%request As %CSP.Request) As %SystemBase
 {
-    set settingsURL = "/isc/studio/usertemplates/gitsourcecontrol/gitprojectsettings.csp?CSPSHARE=1&NSpace="_$namespace_"&Username="_$username
+    set settingsURL = "/isc/studio/usertemplates/gitsourcecontrol/gitprojectsettings.csp?CSPSHARE=1&Namespace="_$namespace_"&Username="_$username
     set settingsURL = ..GetURLPrefix(%request, settingsURL)
     quit {"url": (settingsURL)}
 }
diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
@@ -57,13 +57,10 @@ body {
 </head>
 <body>
 <server>
- new $namespace
- set namespace = %request.Data("NSpace",1)
- set $namespace = namespace
-     
- set webuiURL = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_$namespace_"/?CSPSHARE=1"
+ set namespace = $namespace
+ set webuiURL = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_namespace_"/?CSPSHARE=1"
  set webuiURL = ##class(SourceControl.Git.WebUIDriver).GetURLPrefix(%request, webuiURL)
- 
+
  set settings = ##class(SourceControl.Git.Settings).%New()
 
  if $Data(%request.Data("gitsettings",1)) {
@@ -86,7 +83,7 @@ body {
 </server>
 <div class = 'container'>    
     <form method='post'>
-        <input type="hidden" name="NSpace" value="#(..EscapeHTML(namespace))#" />
+        <input type="hidden" name="Namespace" value="#(..EscapeHTML(namespace))#" />
         <input type="hidden" name="gitsettings" value="1" />
         <div class="col-sm-12"><br></div>
         <div class="row">
diff --git a/module.xml b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.1.0</Version>
+      <Version>2.1.1</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ ClassMethod GetURLPrefix(%request As %CSP.Request, URL As %String) As %String`
`212`	`212`
`213`	`213`	`ClassMethod GetSettingsURL(%request As %CSP.Request) As %SystemBase`
`214`	`214`	`{`
`215`		`- set settingsURL = "/isc/studio/usertemplates/gitsourcecontrol/gitprojectsettings.csp?CSPSHARE=1&NSpace="_$namespace_"&Username="_$username`
	`215`	`+ set settingsURL = "/isc/studio/usertemplates/gitsourcecontrol/gitprojectsettings.csp?CSPSHARE=1&Namespace="_$namespace_"&Username="_$username`
`216`	`216`	`set settingsURL = ..GetURLPrefix(%request, settingsURL)`
`217`	`217`	`quit {"url": (settingsURL)}`
`218`	`218`	`}`