Merge branch 'devel'

Author: b-angelov

izpitnik/accounts/api/views.py

@@ -128,6 +128,10 @@ def delete(self, request, *args, **kwargs):
         kwargs = self.rectify_kwarg(request, kwargs)
         return super().delete(request, *args, **kwargs)
 
+    def perform_destroy(self, instance):
+        instance.is_active = False
+        instance.save()
+
     def perform_update(self, serializer):
         instance = serializer.save()
         uploaded = self.request.FILES.get('image') or self.request.FILES.get('avatar') or self.request.FILES.get(

izpitnik/articles/api/views.py

@@ -19,7 +19,7 @@ class ArtilceAPIView(AuthClass, ListAPIView):
     serializer_class = ArticleSerializer
 
     def get_object(self):
-        obj = Article.objects.all()
+        obj = Article.objects.filter(author__is_active=True)
         if self.request.GET.get('id'):
             try:
                 obj.get(pk=self.request.GET.get('id'))

izpitnik/articles/views.py

@@ -25,6 +25,9 @@ class ArticleListView(SetOwnerAttribute, NoDataMessage, ArticleUrl, ListView):
     template_name = 'articles/articles.html'
     model = Article
 
+    def get_queryset(self, *args, **kwargs):
+        return super().get_queryset(*args,**kwargs).filter(author__is_active=True)
+
 
 class ArticlesByUser(ArticleListView):
     no_data_message = _('for this user')