diff --git a/webapp/serializers.py b/webapp/serializers.py index 85fefef..d60a960 100644 --- a/webapp/serializers.py +++ b/webapp/serializers.py @@ -174,4 +174,4 @@ class OccupationSerializer(serializers.ModelSerializer): class JobAdSerializer(serializers.ModelSerializer): class Meta: model = JobAd - fields = ('title_fi', 'title_en', 'description_fi', 'description_en', 'content_fi', 'content_en', 'visible', 'autohide_at', 'autohide_enabled') + fields = ('id', 'title_fi', 'title_en', 'description_fi', 'description_en', 'content_fi', 'content_en', 'visible', 'autohide_at', 'autohide_enabled') diff --git a/webapp/views.py b/webapp/views.py index 66d39fb..fd27d40 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -218,6 +218,11 @@ class JobAdViewSet(ModelViewSet): serializer_class = JobAdSerializer permission_classes = [IsAuthenticatedOrReadOnly] + def get_queryset(self): + if self.request.user.is_authenticated: + return JobAd.objects.all() + return JobAd.objects.filter(visible=True, autohide_at__gt=timezone.now()) + @require_http_methods(["GET"]) def about_view(request, *args, **kwargs):