diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py index 1e1df9edc..4887035ad 100644 --- a/r2/r2/config/routing.py +++ b/r2/r2/config/routing.py @@ -206,8 +206,6 @@ def make_map(): mc('/promoted/graph', controller='promote', action='graph') mc('/promoted/admin/graph', controller='promote', action='admingraph') - mc('/promoted/inventory/:sr_name', - controller='promote', action='inventory') mc('/promoted/:action', controller='promote', requirements=dict(action="edit_promo|new_promo|roadblock")) diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py index 9ad9a08c6..495a6c9e2 100644 --- a/r2/r2/controllers/promotecontroller.py +++ b/r2/r2/controllers/promotecontroller.py @@ -271,30 +271,6 @@ class PromoteController(ListingController): return content.as_csv() return PromotePage("admingraph", content=content).render() - def GET_inventory(self, sr_name): - ''' - Return available inventory data as json for use in ajax calls - ''' - inv_start_date = promote.promo_datetime_now() - inv_end_date = inv_start_date + timedelta(60) - inventory = promote.get_available_impressions( - sr_name, - inv_start_date, - inv_end_date, - fuzzed=(not c.user_is_admin) - ) - dates = [] - impressions = [] - max_imps = 0 - for date, imps in inventory.iteritems(): - dates.append(date.strftime("%m/%d/%Y")) - impressions.append(imps) - max_imps = max(max_imps, imps) - return json.dumps({'sr':sr_name, - 'dates': dates, - 'imps':impressions, - 'max_imps':max_imps}) - # ## POST controllers below @validatedForm(VSponsorAdmin(), link=VLink("link_id"), diff --git a/r2/r2/public/static/js/sponsored.js b/r2/r2/public/static/js/sponsored.js index c3a1221dc..fac92d9e2 100644 --- a/r2/r2/public/static/js/sponsored.js +++ b/r2/r2/public/static/js/sponsored.js @@ -400,29 +400,3 @@ function pay_campaign(elem) { function view_campaign(elem) { $.redirect($(elem).find('input[name="view_live_url"]').val()); } - -// writes rows into inventory table when subreddit selector changes -function update_inventory_table() { - var sr = $('#targeting').attr('checked') ? $('#sr-autocomplete').val() : ' reddit.com'; - $.ajax({ - url: '/promoted/inventory/' + sr, - type: 'GET', - dataType: 'json', - // on success, update title to show subreddit name and fill table rows - success: function(data) { // {'sr':'funny', 'dates':[...], 'imps':[...]} - var sr_name = (data['sr'] == ' reddit.com') ? 'front page' : data['sr']; - $('#inventory-title > span').text('available ' + sr_name + ' impressions'); // FIXME: i18n - $('#inventory').empty(); - $('#inventory').append('dateimps'); - $.each(data['imps'], function(i) { - var w = Math.round(50. * data['imps'][i] / data['max_imps']); - var row = ['', - '' + data['dates'][i] + '', - '' + data['imps'][i] + '', - '
', - '']; - $('#inventory > tbody').append(row.join('')) - }); - } - }); -}