github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 08:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Delete unsupported maximum_clicks and maximum_views options.

Browse Source
This commit is contained in:
bsimpson63
2013-05-06 16:05:36 -04:00
committed by Brian Simpson
parent 8e8883b440
commit 87bee2cc9d
2 changed files with 1 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
r2/r2/controllers/promotecontroller.py
View File

@@ -363,10 +363,6 @@ class PromoteController(ListingController):
url=VUrl('url', allow_self=False, lookup=False),
ip=ValidIP(),
disable_comments=VBoolean("disable_comments"),
set_clicks=VBoolean("set_maximum_clicks"),
max_clicks=VInt("maximum_clicks", min=0),
set_views=VBoolean("set_maximum_views"),
max_views=VInt("maximum_views", min=0),
media_width=VInt("media-width", min=0),
media_height=VInt("media-height", min=0),
media_embed=VLength("media-embed", 1000),
@@ -375,20 +371,12 @@ class PromoteController(ListingController):
)
def POST_edit_promo(self, form, jquery, ip, l, title, url,
disable_comments,
set_clicks, max_clicks,
set_views, max_views,
media_height, media_width, media_embed,
media_override, domain_override):
should_ratelimit = False
if not c.user_is_sponsor:
set_clicks = False
set_views = False
should_ratelimit = True
if not set_clicks:
max_clicks = None
if not set_views:
max_views = None
if not should_ratelimit:
c.errors.remove((errors.RATELIMIT, 'ratelimit'))
@@ -437,10 +425,6 @@ class PromoteController(ListingController):
if trusted and promote.is_unapproved(l):
promote.accept_promotion(l)
if c.user_is_sponsor:
l.maximum_clicks = max_clicks
l.maximum_views = max_views
# comment disabling is free to be changed any time.
l.disable_comments = disable_comments
if c.user_is_sponsor or c.user.trusted_sponsor:

33
r2/r2/templates/promotelinkform.html
View File

@@ -352,39 +352,8 @@ ${self.javascript_setup()}
<%utils:line_field title="${_('options')}" id="commenting-field"
css_class="rounded">
<div class="delete-field">
<%
clicks = views = 0
disable_comments = False
if thing.link:
disable_comments = getattr(thing.link, "disable_comments", False)
clicks = getattr(thing.link, "maximum_clicks", 0) or 0
views = getattr(thing.link, "maximum_views", 0) or 0
%>
${checkbox("disable_comments", _("disable comments"), disable_comments)}
${checkbox("disable_comments", _("disable comments"), getattr(thing.link, 'disable_comments', False))}
<br />
%if c.user_is_sponsor:
${checkbox("set_maximum_clicks",
unsafe("maximum clicks:&#32; " +
"<input type='text' style='width:auto' " +
"onfocus='update_box(this)' " +
"name='maximum_clicks' size='7' " +
"value='%s' />" % clicks),
clicks)}
<br />
${checkbox("set_maximum_views",
unsafe("maximum views:&#32;" +
"<input type='text' style='width:auto' " +
"onfocus='update_box(this)' " +
"name='maximum_views' size='7' " +
"value='%s' />" % views),
views)}
<br />
%endif
</div>
<div class="infotext rounded">