Skip to content

Commit

Permalink
Merge pull request #6 from pyobs/develop
Browse files Browse the repository at this point in the history
v1.1.2
thusser authored Feb 4, 2021
2 parents ea3050c + c96db42 commit 5dd3b4b
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions pyobs_archive/api/views.py
Original file line number Diff line number Diff line change
@@ -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),
2 changes: 1 addition & 1 deletion pyobs_archive/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '1.1.1'
VERSION = '1.1.2'

0 comments on commit 5dd3b4b

Please sign in to comment.