From dbfef253e5b56d7b701731537d469b27257fcb62 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Tue, 14 Aug 2012 11:28:31 -0700
Subject: [PATCH] Corrects the CSV download link for overview pages.

Fixes bug 1020555.

Change-Id: I22dd5b14cd8db5dc7a0956c46aaf6c44dfcbd6b1
---
 horizon/usage/base.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/horizon/usage/base.py b/horizon/usage/base.py
index 8cc95560c1..1bfb3dd709 100644
--- a/horizon/usage/base.py
+++ b/horizon/usage/base.py
@@ -70,15 +70,13 @@ class BaseUsage(object):
 
     def get_form(self):
         if not hasattr(self, 'form'):
-            if (any(key in ['month', 'year']
-                    for key in self.request.GET.keys())):
+            if any(key in ['month', 'year'] for key in self.request.GET):
                 # bound form
                 self.form = forms.DateForm(self.request.GET)
             else:
                 # non-bound form
-                self.form = forms.DateForm(initial={
-                                        'month': self.today.month,
-                                        'year': self.today.year})
+                self.form = forms.DateForm(initial={'month': self.today.month,
+                                                    'year': self.today.year})
         return self.form
 
     def get_usage_list(self, start, end):
@@ -107,7 +105,12 @@ class BaseUsage(object):
                 self.summary[key] += value
 
     def csv_link(self):
-        return "?date_month=%s&date_year=%s&format=csv" % self.get_date_range()
+        form = self.get_form()
+        if hasattr(form, "cleaned_data"):
+            data = form.cleaned_data
+        else:
+            data = {"month": self.today.month, "year": self.today.year}
+        return "?month=%s&year=%s&format=csv" % (data['month'], data['year'])
 
 
 class GlobalUsage(BaseUsage):