Skip to content

Commit 36e7ff4

Browse files
committed
Use $SYSTEM.Version.SystemMode
Use $SYSTEM.Version.SystemMode to deal with environment name Add 'Failover' as an option
1 parent 4ee0b3e commit 36e7ff4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

cls/SourceControl/Git/Settings.cls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
182182
do %code.WriteLine(" set list(1) = ""DEVELOPMENT""")
183183
do %code.WriteLine(" set list(2) = ""TEST""")
184184
do %code.WriteLine(" set list(3) = ""LIVE""")
185-
do %code.WriteLine(" set list(4) = """"")
186-
do %code.WriteLine(" set value = """"")
185+
do %code.WriteLine(" set list(4) = ""FAILOVER""")
186+
do %code.WriteLine(" set list(5) = """"")
187+
do %code.WriteLine(" set value = inst.property")
187188
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetArray("_promptQuoted_",.value,.list,,,,"_defaultPromptFlag_")")
188189
} else {
189190
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")

cls/SourceControl/Git/Utils.cls

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ ClassMethod WarnInstanceWideUncommitted() As %Boolean
165165

166166
ClassMethod EnvironmentName() As %String
167167
{
168-
quit $get(@..#Storage@("settings","environmentName"),"")
168+
quit $SYSTEM.Version.SystemMode()
169169
}
170170

171171
ClassMethod IsLIVE() As %Boolean
172172
{
173-
quit $get(@..#Storage@("settings","environmentName"),1)="LIVE"
173+
quit ..EnvironmentName()="LIVE"
174174
}
175175

176176
ClassMethod NeedSettings() As %Boolean [ CodeMode = expression ]

csp/gitprojectsettings.csp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ body {
297297
<div class="col-sm-7">
298298
<select class="form-control" id="environmentName" name="environmentName">
299299
<server>
300-
for envName = "TEST","DEVELOPMENT","LIVE","" {
300+
for envName = "TEST","DEVELOPMENT","LIVE","FAILOVER","" {
301301
// create option with envName, set selected if envName == current environmentName
302302
&html<<option #($CASE(envName, settings.environmentName: "selected", :""))# value=#(envName)#>#(envName)# </option>>
303303
}

0 commit comments

Comments
 (0)