Skip to content

Commit

Permalink
Merge pull request #494 from intersystems/fix-461
Browse files Browse the repository at this point in the history
Changed prompts in configure from 0/1 to no/yes
  • Loading branch information
isc-tleavitt authored Sep 26, 2024
2 parents 2feb15c + 2908f0d commit 317c644
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [2.5.1] - Unreleased

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

## [2.5.0] - 2024-09-24
Expand Down
19 changes: 18 additions & 1 deletion cls/SourceControl/Git/Settings.cls
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,24 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
set prompt = $$$comMemberKeyGet(%class.Name,$$$cCLASSproperty,property,$$$cPROPdescription)
set promptQuoted = $$$QUOTE(prompt_":")
set promptQuoted = $replace(promptQuoted,"${username}","'""_$Username_""'")
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
} elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
do %code.WriteLine(" set list(1) = ""Yes""")
do %code.WriteLine(" set list(2) = ""No""")
do %code.WriteLine(" set list(3) = ""System's Default Mode""")
do %code.WriteLine(" if inst.userBasicMode = ""system"" { set value = ""System's Default Mode""}")
do %code.WriteLine(" elseif inst.userBasicMode = 1 { set value = ""Yes""}")
do %code.WriteLine(" elseif inst.userBasicMode = 0 { set value = ""No""}")
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetArray("_promptQuoted_",.value,.list,,,,"_basicModePromptFlag_")")
do %code.WriteLine(" if value = ""System's Default Mode"" { set value = ""system""}")
do %code.WriteLine(" elseif value = ""Yes"" { set value = 1}")
do %code.WriteLine(" elseif value = ""No"" { set value = 0}")
} else {
do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
}
do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }")
do %code.WriteLine(" set inst."_property_" = value")

Expand Down

0 comments on commit 317c644

Please sign in to comment.