From ec22bd54f806e6041a2b4f62bb975e5721da42ec Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Tue, 6 Jan 2015 00:22:17 -0500 Subject: [PATCH] Don't allow editing a deleted PromoCampaign. --- r2/r2/controllers/promotecontroller.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py index 25bb85a3d..6d483e51d 100644 --- a/r2/r2/controllers/promotecontroller.py +++ b/r2/r2/controllers/promotecontroller.py @@ -891,12 +891,15 @@ class PromoteApiController(ApiController): campaign = None if campaign_id36: try: - campaign = PromoCampaign._byID36(campaign_id36) + campaign = PromoCampaign._byID36(campaign_id36, data=True) except NotFound: pass - if campaign and link._id != campaign.link_id: - return abort(404, 'not found') + if campaign and (campaign._deleted or link._id != campaign.link_id): + campaign = None + + if not campaign: + return abort(404, 'not found') if priority.cpm: min_bid = 0 if c.user_is_sponsor else g.min_promote_bid