#1: viewer tests passing

nansencenter · Feb 4, 2019 · c88c01d · c88c01d
1 parent 8a15d6c
commit c88c01d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/geospaas/viewer/tests.py b/geospaas/viewer/tests.py
@@ -110,14 +110,14 @@ def setUp(self):
                 'date0': date0,
                 'date1': date1,
                 'platform': [source.platform.id],
-                'instrument': [source.instrument.id]
+                'instrument': [source.instrument.id],
             }
         self.invalid_form = {
                 'polygon': 1,
                 'date0': date0,
                 'date1': date1,
-                'platform': source.platform.id,
-                'instrument': source.instrument.id
+                'platform': [source.platform.id],
+                'instrument': [source.instrument.id],
             }
 
     def test_search_form(self):

diff --git a/geospaas/viewer/views.py b/geospaas/viewer/views.py
@@ -69,16 +69,17 @@ def render(self, request):
         ''' Render page based on form data '''
         # filter datasets
         datasets = self.image_class.objects.all()
-        import ipdb
-        ipdb.set_trace()
         datasets = datasets.order_by('time_coverage_start')
-        if self.form.cleaned_data['platform'] is not None:
+        if self.form.cleaned_data['platform'] is not None and \
+                len(self.form.cleaned_data['platform'])>0:
             src = self.form.cleaned_data['platform']
             datasets = datasets.filter(sources__platform__in=src)
-        if self.form.cleaned_data['instrument'] is not None:
+        if self.form.cleaned_data['instrument'] is not None and \
+                len(self.form.cleaned_data['instrument'])>0:
             src = self.form.cleaned_data['instrument']
             datasets = datasets.filter(sources__instrument__in=src)
-        if self.form.cleaned_data['parameter'] is not None:
+        if self.form.cleaned_data['parameter'] is not None and \
+                len(self.form.cleaned_data['parameter'])>0:
             src = self.form.cleaned_data['parameter']
             datasets = datasets.filter(parameters__in=src)
         t0 = self.form.cleaned_data['date0']