x/tuskar-ui
Code Issues Proposed changes

Merge "Corrects the CSV download link for overview pages."

Browse Source
This commit is contained in:
Jenkins 2012-08-15 02:05:33 +00:00 committed by Gerrit Code Review
commit 6bc472b914
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
horizon/usage/base.py
View File

@ -70,15 +70,13 @@ class BaseUsage(object):
def get_form(self): def get_form(self):
if not hasattr(self, 'form'): if not hasattr(self, 'form'):
if (any(key in ['month', 'year'] if any(key in ['month', 'year'] for key in self.request.GET):
for key in self.request.GET.keys())):
# bound form # bound form
self.form = forms.DateForm(self.request.GET) self.form = forms.DateForm(self.request.GET)
else: else:
# non-bound form # non-bound form
self.form = forms.DateForm(initial={ self.form = forms.DateForm(initial={'month': self.today.month,
'month': self.today.month, 'year': self.today.year})
'year': self.today.year})
return self.form return self.form
def get_usage_list(self, start, end): def get_usage_list(self, start, end):
@ -107,7 +105,12 @@ class BaseUsage(object):
self.summary[key] += value self.summary[key] += value
def csv_link(self): 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): class GlobalUsage(BaseUsage):