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

Merge branch 'mixmasala-fix_negative_payout' into better-validation

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

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

@ -298,7 +298,15 @@ class Proposal(db.Model):
if len(milestone.content) > 200:
raise ValidationException("Milestone content cannot be longer than 200 chars")
payout_total += float(milestone.payout_percent)
try:
p = float(milestone.payout_percent)
if p <= 0:
raise ValidationException("Milestone payout percent must be greater than zero")
except ValueError:
raise ValidationException("Milestone payout percent must be a number")
payout_total += p
try:
present = datetime.datetime.today().replace(day=1)

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

@ -148,6 +148,10 @@ 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) <= 0) {
return 'Payout percent must be greater than zero';
} else if (parseInt(ms.payoutPercent, 10) > 100) {
return 'Payout percent must be less than or equal to 100';
}
// Last one shows percentage errors