From 052b4b8a85862f5f5765b345a792ec7aeab64939 Mon Sep 17 00:00:00 2001 From: Keith Mitchell Date: Thu, 10 Jan 2013 11:06:43 -0800 Subject: [PATCH] Use promote.cost_per_X functions in Promote_Graph --- r2/r2/lib/pages/pages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 6a4ca13de..216a890c8 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -3614,8 +3614,8 @@ class Promote_Graph(Templated): if day in self.promo_traffic: delivered, clicks = self.promo_traffic[day] if i in market and day < today: - cpm = "$%.2f" % (market[i] * 1000. / max(delivered, 1)) - cpc = "$%.2f" % (market[i] * 1. / max(clicks, 1)) + cpm = "$%.2f" % promote.cost_per_mille(market[i], delivered) + cpc = "$%.2f" % promote.cost_per_click(market[i], clicks) delivered = format_number(delivered, c.locale) clicks = format_number(clicks, c.locale) if day == today: