From 67c71b0870e4b347a472bbc7a332f2c7c3bda66c Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Mon, 12 Aug 2013 18:49:49 -0400 Subject: [PATCH] Read roadblocks from Cassandra. --- r2/r2/controllers/promotecontroller.py | 7 ++++--- r2/r2/lib/pages/pages.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py index 202f55501..f77064ed6 100644 --- a/r2/r2/controllers/promotecontroller.py +++ b/r2/r2/controllers/promotecontroller.py @@ -93,6 +93,7 @@ from r2.models import ( PromoCampaign, PromotionLog, PromotionWeights, + PromotedLinkRoadblock, Subreddit, ) @@ -482,7 +483,7 @@ class PromoteController(ListingController): return if dates and sr: sd, ed = dates - promote.roadblock_reddit(sr.name, sd.date(), ed.date()) + PromotedLinkRoadblock.add(sr, sd, ed) jquery.refresh() @validatedForm(VSponsorAdmin(), @@ -496,7 +497,7 @@ class PromoteController(ListingController): def POST_rm_roadblock(self, form, jquery, dates, sr): if dates and sr: sd, ed = dates - promote.unroadblock_reddit(sr.name, sd.date(), ed.date()) + PromotedLinkRoadblock.remove(sr, sd, ed) jquery.refresh() @validatedForm(VSponsor('link_id'), @@ -592,7 +593,7 @@ class PromoteController(ListingController): # checking to get the error set in the form, but we can't # check for rate-limiting if there's no subreddit return - oversold = promote.is_roadblocked(sr.name, start, end) + oversold = PromotedLinkRoadblock.is_roadblocked(sr, start, end) if oversold and not c.user_is_sponsor: msg_params = {"start": oversold[0].strftime('%m/%d/%Y'), "end": oversold[1].strftime('%m/%d/%Y')} diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 013a8b0aa..a2c2c8077 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -30,7 +30,7 @@ from r2.models import Link, Printable, Trophy, bidding, PromoCampaign, Promotion from r2.models import Flair, FlairTemplate, FlairTemplateBySubredditIndex from r2.models import USER_FLAIR, LINK_FLAIR from r2.models import GoldPartnerDealCode -from r2.models.promo import NO_TRANSACTION, PromotionLog +from r2.models.promo import NO_TRANSACTION, PromotionLog, PromotedLinkRoadblock from r2.models.token import OAuth2Client, OAuth2AccessToken from r2.models import traffic from r2.models import ModAction @@ -3430,7 +3430,7 @@ class PromoAdminTool(Reddit): class Roadblocks(Templated): def __init__(self): - self.roadblocks = promote.get_roadblocks() + self.roadblocks = PromotedLinkRoadblock.get_roadblocks() Templated.__init__(self) # reference "now" to what we use for promtions now = promote.promo_datetime_now()