.
This commit is contained in:
+3
-3
@@ -11,7 +11,7 @@ class LongFilter(django_filters.FilterSet):
|
|||||||
|
|
||||||
def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
|
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():
|
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)
|
super(LongFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ class LongSeriesFilter(django_filters.FilterSet):
|
|||||||
fields = ("modality","long", "examination", "author")
|
fields = ("modality","long", "examination", "author")
|
||||||
|
|
||||||
def __init__(self, data=None, queryset=None, prefix=None, strict=None, user=None, request=None):
|
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():
|
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(LongSeriesFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
|
super(LongSeriesFilter, self).__init__(data=data, queryset=queryset, prefix=prefix, request=request)
|
||||||
pass
|
pass
|
||||||
+2
-2
@@ -600,14 +600,14 @@ def get_region_id(request):
|
|||||||
return HttpResponse("/")
|
return HttpResponse("/")
|
||||||
|
|
||||||
|
|
||||||
class LongView(AuthorOrCheckerRequiredMixin, SingleTableMixin, FilterView):
|
class LongView(LoginRequiredMixin, SingleTableMixin, FilterView):
|
||||||
model = Long
|
model = Long
|
||||||
table_class = LongTable
|
table_class = LongTable
|
||||||
template_name = "longs/view.html"
|
template_name = "longs/view.html"
|
||||||
|
|
||||||
filterset_class = LongFilter
|
filterset_class = LongFilter
|
||||||
|
|
||||||
class LongSeriesView(AuthorOrCheckerRequiredMixin, SingleTableMixin, FilterView):
|
class LongSeriesView(LoginRequiredMixin, SingleTableMixin, FilterView):
|
||||||
model = LongSeries
|
model = LongSeries
|
||||||
table_class = LongSeriesTable
|
table_class = LongSeriesTable
|
||||||
template_name = "longs/view.html"
|
template_name = "longs/view.html"
|
||||||
|
|||||||
Reference in New Issue
Block a user