From 44c82752cc58232b572efcc51112a30028703c50 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Wed, 1 Feb 2017 15:57:29 -0300 Subject: [PATCH] checking if resources are available when deleting subject is done --- subjects/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subjects/views.py b/subjects/views.py index 219e386..c6ad60b 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -426,10 +426,13 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView): def get(self, request, *args, **kwargs): self.object = self.get_object() - if self.object.students.all().count() > 0: + if self.object.students.count() > 0: messages.error(self.request, _("Subject can't be removed. The subject still possess students and learning objects associated")) - return JsonResponse({'error':True,'url':reverse_lazy('subjects:index')}) + for topic in self.object.topic_subject.all(): + if topic.resource_topic.count() > 0: + messages.error(self.request, _("Subject can't be removed. The subject still possess students and learning objects associated")) + return JsonResponse({'error':True,'url':reverse_lazy('subjects:index')}) context = self.get_context_data(object=self.object) return self.render_to_response(context) -- libgit2 0.21.2