From 279ccd9244e5b686beb52dd253d1a51054badf7c Mon Sep 17 00:00:00 2001 From: Ross Date: Thu, 29 Apr 2021 19:49:25 +0100 Subject: [PATCH] . --- longs/filters.py | 6 +++--- longs/views.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/longs/filters.py b/longs/filters.py index 83b5b545..2a53af92 100755 --- a/longs/filters.py +++ b/longs/filters.py @@ -11,7 +11,7 @@ class LongFilter(django_filters.FilterSet): def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None): if not request.user.groups.filter(name="longs_checker").exists(): - queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id) + queryset = queryset.filter(author__id=request.user.id) super(LongFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request) pass @@ -21,7 +21,7 @@ class LongSeriesFilter(django_filters.FilterSet): fields = ("modality","long", "examination", "author") def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None): - #if not request.user.groups.filter(name="longs_checker").exists(): - # queryset = queryset.filter(open_access=True) | queryset.filter(author__id=request.user.id) + if not request.user.groups.filter(name="longs_checker").exists(): + queryset = queryset.filter(author__id=request.user.id) super(LongSeriesFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request) pass \ No newline at end of file diff --git a/longs/views.py b/longs/views.py index b538bf2c..e2b28e84 100755 --- a/longs/views.py +++ b/longs/views.py @@ -600,14 +600,14 @@ def get_region_id(request): return HttpResponse("/") -class LongView(AuthorOrCheckerRequiredMixin, SingleTableMixin, FilterView): +class LongView(LoginRequiredMixin, SingleTableMixin, FilterView): model = Long table_class = LongTable template_name = "longs/view.html" filterset_class = LongFilter -class LongSeriesView(AuthorOrCheckerRequiredMixin, SingleTableMixin, FilterView): +class LongSeriesView(LoginRequiredMixin, SingleTableMixin, FilterView): model = LongSeries table_class = LongSeriesTable template_name = "longs/view.html"