diff --git a/mural/templatetags/mural_filters.py b/mural/templatetags/mural_filters.py index cf56461..2acd49d 100644 --- a/mural/templatetags/mural_filters.py +++ b/mural/templatetags/mural_filters.py @@ -66,14 +66,14 @@ def show_settings(post, user): return True if post._my_subclass == "categorypost": - if post.space.coordinators == user: + if post.categorypost.space.coordinators == user: return True if post._my_subclass == "subjectpost": - if post.space.professor == user: + if post.subjectpost.space.professor == user: return True - if post.space.category.coordinators == user: + if post.subjectpost.space.category.coordinators == user: return True return False @@ -87,14 +87,14 @@ def show_settings_comment(comment, user): return True if comment.post._my_subclass == "categorypost": - if comment.post.space.coordinators == user: + if comment.post.categorypost.space.coordinators == user: return True if comment.post._my_subclass == "subjectpost": - if comment.post.space.professor == user: + if comment.post.subjectpost.space.professor == user: return True - if comment.post.space.category.coordinators == user: + if comment.post.subjectpost.space.category.coordinators == user: return True return False diff --git a/mural/views.py b/mural/views.py index 29d1591..2db470d 100644 --- a/mural/views.py +++ b/mural/views.py @@ -322,7 +322,7 @@ class CategoryCreate(LoginRequiredMixin, generic.edit.CreateView): self.object.save() - users = User.objects.filter(Q(is_staff = True) | Q(coordinators = cat) | Q(professors__category = cat) | Q(subject_student__category = cat)).exclude(id = self.request.user.id) + users = getSpaceUsers(self.request.user.id, self.object) entries = [] notify_type = "mural" @@ -370,7 +370,7 @@ class CategoryUpdate(LoginRequiredMixin, generic.UpdateView): self.object.save() - users = User.objects.all().exclude(id = self.request.user.id) + users = getSpaceUsers(self.request.user.id, self.object) notify_type = "mural" _view = render_to_string("mural/_view.html", {"post": self.object}, self.request) @@ -407,7 +407,7 @@ class CategoryDelete(LoginRequiredMixin, generic.DeleteView): return context def get_success_url(self): - users = User.objects.all().exclude(id = self.request.user.id) + users = getSpaceUsers(self.request.user.id, self.object) notify_type = "mural" pathname = reverse("mural:manage_category") -- libgit2 0.21.2