mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2074 from sqrrm/proposal-display

Browse source 
Don't validate display fields in proposal display
This commit is contained in:
Manfred Karrer 2018-12-06 16:25:25 +01:00 • committed by GitHub
commit aadfd5c997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
View file

@ -194,13 +194,15 @@ public class ProposalDisplay {
Res.get("dao.proposal.display.type"), proposalType.getDisplayName(), proposalTypeTop).second;
nameTextField = addInputTextField(gridPane, ++gridRow, Res.get("dao.proposal.display.name"));
nameTextField.setValidator(new InputValidator());
if (isMakeProposalScreen)
nameTextField.setValidator(new InputValidator());
inputControls.add(nameTextField);
linkInputTextField = addInputTextField(gridPane, ++gridRow,
Res.get("dao.proposal.display.link"));
linkInputTextField.setPromptText(Res.get("dao.proposal.display.link.prompt"));
linkInputTextField.setValidator(new InputValidator());
if (isMakeProposalScreen)
linkInputTextField.setValidator(new InputValidator());
inputControls.add(linkInputTextField);
Tuple3<Label, HyperlinkWithIcon, VBox> tuple = FormBuilder.addTopLabelHyperlinkWithIcon(gridPane, gridRow,
@ -222,15 +224,17 @@ public class ProposalDisplay {
checkNotNull(requestedBsqTextField, "requestedBsqTextField must not be null");
inputControls.add(requestedBsqTextField);
BsqValidator bsqValidator = new BsqValidator(bsqFormatter);
if (proposalType == ProposalType.COMPENSATION_REQUEST) {
bsqValidator.setMinValue(daoFacade.getMinCompensationRequestAmount());
bsqValidator.setMaxValue(daoFacade.getMaxCompensationRequestAmount());
} else if (proposalType == ProposalType.REIMBURSEMENT_REQUEST) {
bsqValidator.setMinValue(daoFacade.getMinReimbursementRequestAmount());
bsqValidator.setMaxValue(daoFacade.getMaxReimbursementRequestAmount());
if (isMakeProposalScreen) {
BsqValidator bsqValidator = new BsqValidator(bsqFormatter);
if (proposalType == ProposalType.COMPENSATION_REQUEST) {
bsqValidator.setMinValue(daoFacade.getMinCompensationRequestAmount());
bsqValidator.setMaxValue(daoFacade.getMaxCompensationRequestAmount());
} else if (proposalType == ProposalType.REIMBURSEMENT_REQUEST) {
bsqValidator.setMinValue(daoFacade.getMinReimbursementRequestAmount());
bsqValidator.setMaxValue(daoFacade.getMaxReimbursementRequestAmount());
}
requestedBsqTextField.setValidator(bsqValidator);
}
requestedBsqTextField.setValidator(bsqValidator);
break;
case CHANGE_PARAM:
checkNotNull(gridPane, "gridPane must not be null");
@ -264,7 +268,7 @@ public class ProposalDisplay {
paramValueTextField.clear();
String currentValue = bsqFormatter.formatParamValue(newValue, daoFacade.getParamValue(newValue));
paramValueTextField.setPromptText(Res.get("dao.param.currentValue", currentValue));
if (changeParamValidator != null) {
if (changeParamValidator != null && isMakeProposalScreen) {
ChangeParamInputValidator validator = new ChangeParamInputValidator(newValue, changeParamValidator);
paramValueTextField.setValidator(validator);
}