Skip to content

Commit d2b5ae4

Browse files
robdyAlMcKinlay
authored andcommitted
Don't allow negative pokemon/eggs given away (#597)
* Update Reference.js * Add files via upload * Add files via upload * Add files via upload * Update editreference.ejs * Update index.ejs * Update ReferenceController.js * Changed 6 spaces to 4 due to Travis check * Update ReferenceController.js * Another attempt to pass Travis check * Unnecessary comment removed * Comment removed
1 parent dcb2ff0 commit d2b5ae4

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

api/controllers/ReferenceController.js

+13
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,18 @@ module.exports = {
5353
if (req.params.number && isNaN(req.params.number)) {
5454
return res.badRequest({err: "Number must be a number"});
5555
}
56+
57+
if (req.params.number < 0) {
58+
return res.badRequest({err: "Number must be 0 or more"});
59+
}
60+
5661
return Reference.findOne({url: {endsWith: endOfUrl}, user: req.user.name}).then(ref => {
5762
if (ref && !(ref.type === 'egg' && req.params.type === 'egg')) {
5863
return res.status(400).json({err: 'Already added that URL.'});
5964
}
65+
66+
67+
6068
return Reference.create({
6169
url: req.params.url,
6270
user: req.user.name,
@@ -78,6 +86,11 @@ module.exports = {
7886
if (req.params.number && isNaN(req.params.number)) {
7987
return res.badRequest({err: "Number must be a number"});
8088
}
89+
90+
if (req.params.number < 0) {
91+
return res.badRequest({err: "Number must be 0 or more"});
92+
}
93+
8194
Reference.findOne({id: req.params.id, user: req.user.name}).exec(function (err, ref) {
8295
if (err || !ref) {
8396
return res.notFound();

api/models/Reference.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module.exports = {
1818
description: "string",
1919
number: {
2020
type: "integer",
21+
min: 0,
2122
required: false
2223
},
2324
type: {

assets/views/home/editreference.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<div class="col-md-8">
6363
<input type="number" class="form-control"
64-
ng-model="selectedRef.number"></input>
64+
ng-model="selectedRef.number" min="0"></input>
6565
</div>
6666
</div>
6767

assets/views/home/index.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<ng-tooltip data-label="Number given" ng-show="hasNumber(addInfo.type)"
6060
title="How many you gave away. This can be updated.">
61-
<input type="number" class="form-control" ng-model="addInfo.number">
61+
<input type="number" class="form-control" ng-model="addInfo.number" min="0">
6262
</ng-tooltip>
6363

6464
<ng-tooltip data-label="Gave" ng-hide="isNotNormalTrade(addInfo.type)"

0 commit comments

Comments
 (0)