Merge "Sets default values for month/year at Usage Form in overview page"
This commit is contained in:
@@ -68,9 +68,15 @@ class BaseUsage(object):
|
|||||||
|
|
||||||
def get_form(self):
|
def get_form(self):
|
||||||
if not hasattr(self, 'form'):
|
if not hasattr(self, 'form'):
|
||||||
self.form = forms.DateForm(self.request.GET,
|
if (any(key in ['month', 'year']
|
||||||
initial={'year': self.today.year,
|
for key in self.request.GET.keys())):
|
||||||
'month': self.today.month})
|
# 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})
|
||||||
return self.form
|
return self.form
|
||||||
|
|
||||||
def get_usage_list(self, start, end):
|
def get_usage_list(self, start, end):
|
||||||
|
|||||||
Reference in New Issue
Block a user