zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust merged in milestone validation

This commit is contained in:
Will O'Beirne 2019-03-18 14:53:15 -04:00
parent 824ba30fa5
commit 4511a1d6e8
No known key found for this signature in database
GPG Key ID: 44C190DB5DEAF9F6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/grant/proposal/models.py
View File

@ -300,9 +300,10 @@ class Proposal(db.Model):
try:
p = float(milestone.payout_percent)
if p <= 0:
if not p.is_integer():
raise ValidationException("Milestone payout percents must be whole numbers, no decimals")
if p <= 0 or p > 100:
raise ValidationException("Milestone payout percent must be greater than zero")
except ValueError:
raise ValidationException("Milestone payout percent must be a number")

6
frontend/client/modules/create/utils.ts
View File

@ -148,10 +148,12 @@ export function getCreateErrors(
return 'Payout percent is required';
} else if (Number.isNaN(parseInt(ms.payoutPercent, 10))) {
return 'Payout percent must be a valid number';
} else if (parseInt(ms.payoutPercent, 10) !== parseFloat(ms.payoutPercent)) {
return 'Payout percent must be a whole number, no decimals';
} else if (parseInt(ms.payoutPercent, 10) <= 0) {
return 'Payout percent must be greater than zero';
return 'Payout percent must be greater than 0%';
} else if (parseInt(ms.payoutPercent, 10) > 100) {
return 'Payout percent must be less than or equal to 100';
return 'Payout percent must be less than or equal to 100%';
}
// Last one shows percentage errors