diff --git a/api/routes/campaigns.js b/api/routes/campaigns.js index 983efe5..381f6a1 100644 --- a/api/routes/campaigns.js +++ b/api/routes/campaigns.js @@ -13,6 +13,8 @@ const checkMT = require('../middleware/permission-check').checkMT; // Mongoose Model using mongoDB const CampaignModel = require('../models/campaign'); +const WarModel = require('../models/war'); + const campaigns = express.Router(); @@ -66,7 +68,10 @@ campaigns.route('/:id') err.status = codes.notfound; return next(err); } - return next(); + WarModel.find({campaign: req.params.id}).remove().exec(); + + res.locals.processed = true; + next(); }) }) diff --git a/static/src/app/statistic/war-submit/war-submit.component.html b/static/src/app/statistic/war-submit/war-submit.component.html index 0c1ca3f..cf7b4fd 100644 --- a/static/src/app/statistic/war-submit/war-submit.component.html +++ b/static/src/app/statistic/war-submit/war-submit.component.html @@ -49,7 +49,7 @@ id="campaign" [(ngModel)]="war.campaign" required> - diff --git a/static/src/app/statistic/war-submit/war-submit.component.ts b/static/src/app/statistic/war-submit/war-submit.component.ts index 690c540..ae96343 100644 --- a/static/src/app/statistic/war-submit/war-submit.component.ts +++ b/static/src/app/statistic/war-submit/war-submit.component.ts @@ -3,6 +3,7 @@ import {ActivatedRoute, Router} from "@angular/router"; import {NgForm} from "@angular/forms"; import {WarService} from "../../services/war-service/war.service"; import {War} from "../../models/model-interfaces"; +import {CampaignService} from "../../services/campaign-service/campaign.service"; @Component({ @@ -28,7 +29,8 @@ export class WarSubmitComponent { constructor(private route: ActivatedRoute, private router: Router, - private warService: WarService) { + private warService: WarService, + private campaignService: CampaignService) { } fileChange(event) {