Ignore mod bans when creating promoted links

dtedesco1 · Jan 25, 2012 · 05c9295 · 05c9295
1 parent e7b672d
commit 05c9295
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py
@@ -244,7 +244,7 @@ def GET_roadblock(self):
                                       reference_date = promote.promo_datetime_now,
                                       business_days = False, 
                                       admin_override = True),
-                   sr = VSubmitSR('sr'))
+                   sr = VSubmitSR('sr', promotion=True))
     def POST_add_roadblock(self, form, jquery, dates, sr):
         if (form.has_errors('startdate', errors.BAD_DATE,
                             errors.BAD_FUTURE_DATE) or
@@ -267,7 +267,7 @@ def POST_add_roadblock(self, form, jquery, dates, sr):
                                       reference_date = promote.promo_datetime_now,
                                       business_days = False, 
                                       admin_override = True),
-                   sr = VSubmitSR('sr'))
+                   sr = VSubmitSR('sr', promotion=True))
     def POST_rm_roadblock(self, form, jquery, dates, sr):
         if dates and sr:
             sd, ed = dates
@@ -283,7 +283,7 @@ def POST_rm_roadblock(self, form, jquery, dates, sr):
                                   admin_override = True),
                    l     = VLink('link_id'),
                    bid   = VBid('bid', 'link_id', 'sr'),
-                   sr = VSubmitSR('sr'),
+                   sr = VSubmitSR('sr', promotion=True),
                    indx = VInt("indx"), 
                    targeting = VLength("targeting", 10))
     def POST_edit_campaign(self, form, jquery, l, indx,

diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
@@ -789,8 +789,9 @@ def run(self, fullname, fullname2):
         abort(403, "forbidden")
 
 class VSubmitSR(Validator):
-    def __init__(self, srname_param, linktype_param = None):
+    def __init__(self, srname_param, linktype_param=None, promotion=False):
         self.require_linktype = False
+        self.promotion = promotion
 
         if linktype_param:
             self.require_linktype = True
@@ -809,7 +810,7 @@ def run(self, sr_name, link_type = None):
             self.set_error(errors.SUBREDDIT_NOEXIST)
             return
 
-        if not c.user_is_loggedin or not sr.can_submit(c.user):
+        if not c.user_is_loggedin or not sr.can_submit(c.user, self.promotion):
             self.set_error(errors.SUBREDDIT_NOTALLOWED)
             return
 

diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py
@@ -212,10 +212,10 @@ def can_comment(self, user):
         else:
             return False
 
-    def can_submit(self, user):
+    def can_submit(self, user, promotion=False):
         if c.user_is_admin:
             return True
-        elif self.is_banned(user):
+        elif self.is_banned(user) and not promotion:
             return False
         elif self.type == 'public':
             return True