Skip to content

Commit 317c644

Browse files
authored
Merge pull request #494 from intersystems/fix-461
Changed prompts in configure from 0/1 to no/yes
2 parents 2feb15c + 2908f0d commit 317c644

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## [2.5.1] - Unreleased
99

1010
### Fixed
11+
- Changed prompts in configure from 0/1 to no/yes (#461)
1112
- Added warnings when user is using incompatible git version (#488)
1213

1314
## [2.5.0] - 2024-09-24

cls/SourceControl/Git/Settings.cls

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,24 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
152152
set prompt = $$$comMemberKeyGet(%class.Name,$$$cCLASSproperty,property,$$$cPROPdescription)
153153
set promptQuoted = $$$QUOTE(prompt_":")
154154
set promptQuoted = $replace(promptQuoted,"${username}","'""_$Username_""'")
155-
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
155+
set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
156+
if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
157+
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
158+
} elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
159+
set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
160+
do %code.WriteLine(" set list(1) = ""Yes""")
161+
do %code.WriteLine(" set list(2) = ""No""")
162+
do %code.WriteLine(" set list(3) = ""System's Default Mode""")
163+
do %code.WriteLine(" if inst.userBasicMode = ""system"" { set value = ""System's Default Mode""}")
164+
do %code.WriteLine(" elseif inst.userBasicMode = 1 { set value = ""Yes""}")
165+
do %code.WriteLine(" elseif inst.userBasicMode = 0 { set value = ""No""}")
166+
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetArray("_promptQuoted_",.value,.list,,,,"_basicModePromptFlag_")")
167+
do %code.WriteLine(" if value = ""System's Default Mode"" { set value = ""system""}")
168+
do %code.WriteLine(" elseif value = ""Yes"" { set value = 1}")
169+
do %code.WriteLine(" elseif value = ""No"" { set value = 0}")
170+
} else {
171+
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
172+
}
156173
do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }")
157174
do %code.WriteLine(" set inst."_property_" = value")
158175

0 commit comments

Comments
 (0)