Merge pull request #6 from pyobs/develop

v1.1.2

Author: thusser

pyobs_archive/api/views.py

@@ -114,6 +114,8 @@ def filter_frames(data, request):
         data = data.filter(INSTRUME=f)
     f = request.GET.get('FILTER', 'ALL')
     if f not in ['', 'ALL']:
+        if f == 'None':
+            f = None
         data = data.filter(FILTER=f)
     f = request.GET.get('RLEVEL', 'ALL')
     if f not in ['', 'ALL']:
@@ -210,6 +212,9 @@ def aggregate_view(request):
     filters = list(data.values_list('FILTER', flat=True).distinct())
     binning = list(data.values_list('XBINNING', 'YBINNING').distinct())
 
+    # remove Nones
+    filters = [(x or "None") for x in filters]
+
     # return all
     return JsonResponse({
         'imagetypes': sorted(image_types),

pyobs_archive/version.py

@@ -1 +1 @@
-VERSION = '1.1.1'
+VERSION = '1.1.2'