Explorar el Código

Merge branch 'master' of github.com:tangentlabs/django-oscar

master
David Winterbottom hace 13 años
padre
commit
cea26b1e7d
Se han modificado 2 ficheros con 4 adiciones y 3 borrados
  1. 1
    1
      oscar/apps/customer/forms.py
  2. 3
    2
      oscar/apps/customer/views.py

+ 1
- 1
oscar/apps/customer/forms.py Ver fichero

109
         return super(SearchByDateRangeForm, self).clean()
109
         return super(SearchByDateRangeForm, self).clean()
110
 
110
 
111
     def description(self):
111
     def description(self):
112
-        if not self.is_bound:
112
+        if not self.is_bound or not self.is_valid():
113
             return 'All orders'
113
             return 'All orders'
114
         date_from = self.cleaned_data['date_from']
114
         date_from = self.cleaned_data['date_from']
115
         date_to = self.cleaned_data['date_to']
115
         date_to = self.cleaned_data['date_to']

+ 3
- 2
oscar/apps/customer/views.py Ver fichero

289
         if 'date_from' in request.GET:
289
         if 'date_from' in request.GET:
290
             self.form = SearchByDateRangeForm(self.request.GET)
290
             self.form = SearchByDateRangeForm(self.request.GET)
291
             if not self.form.is_valid():
291
             if not self.form.is_valid():
292
-                ctx = self.get_context_data()
292
+                self.object_list = self.get_queryset()
293
+                ctx = self.get_context_data(object_list=self.object_list)
293
                 return self.render_to_response(ctx)
294
                 return self.render_to_response(ctx)
294
         else:
295
         else:
295
             self.form = SearchByDateRangeForm()
296
             self.form = SearchByDateRangeForm()
297
 
298
 
298
     def get_queryset(self):
299
     def get_queryset(self):
299
         qs = self.model._default_manager.filter(user=self.request.user)
300
         qs = self.model._default_manager.filter(user=self.request.user)
300
-        if self.form.is_bound:
301
+        if self.form.is_bound and self.form.is_valid():
301
             qs = qs.filter(**self.form.get_filters())
302
             qs = qs.filter(**self.form.get_filters())
302
         return qs
303
         return qs
303
 
304
 

Loading…
Cancelar
Guardar