From 69144042dc03637b2b98e0e22407db0ff8716b10 Mon Sep 17 00:00:00 2001 From: Zambom Date: Tue, 26 Sep 2017 23:15:17 -0300 Subject: [PATCH] Adjusting subject mural post with resource visualization permissions --- mural/utils.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- mural/views.py | 24 +++--------------------- 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/mural/utils.py b/mural/utils.py index 50680dc..afc52e0 100644 --- a/mural/utils.py +++ b/mural/utils.py @@ -1,5 +1,7 @@ from django.db.models import Q +from .models import SubjectPost + from users.models import User def getSpaceUsers(user, post): @@ -19,4 +21,50 @@ def getSpaceUsers(user, post): else: return User.objects.filter(Q(is_staff = True) | Q(professors__id = space) | Q(coordinators__subject_category__id = space) | Q(subject_student__id = space)).exclude(id = user).distinct() - return None \ No newline at end of file + return None + +def getSubjectPosts(subject, user, favorites, mines): + if not favorites: + if mines: + if not user.is_staff: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter( + Q(space__id = subject) & Q(mural_ptr__user = user) & ( + Q(space__category__coordinators = user) | + Q(space__professor = user) | + Q(resource__isnull = True) | + (Q(resource__isnull = False) & (Q(resource__all_students = True) | Q(resource__students = user) | Q(resource__groups__participants = user))))).distinct() + else: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, mural_ptr__user = user) + else: + if not user.is_staff: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter( + Q(space__id = subject) & ( + Q(space__category__coordinators = user) | + Q(space__professor = user) | + Q(resource__isnull = True) | + (Q(resource__isnull = False) & (Q(resource__all_students = True) | Q(resource__students = user) | Q(resource__groups__participants = user))))).distinct() + else: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject) + else: + if mines: + if not user.is_staff: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter( + Q(space__id = subject) & Q(favorites_post__isnull = False) & Q(favorites_post__user = user) & Q(mural_ptr__user = user) & ( + Q(space__category__coordinators = user) | + Q(space__professor = user) | + Q(resource__isnull = True) | + (Q(resource__isnull = False) & (Q(resource__all_students = True) | Q(resource__students = user) | Q(resource__groups__participants = user))))).distinct() + else: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, favorites_post__isnull = False, favorites_post__user = user, mural_ptr__user = user) + else: + if not user.is_staff: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter( + Q(space__id = subject) & Q(favorites_post__isnull = False) & Q(favorites_post__user = user) & ( + Q(space__category__coordinators = user) | + Q(space__professor = user) | + Q(resource__isnull = True) | + (Q(resource__isnull = False) & (Q(resource__all_students = True) | Q(resource__students = user) | Q(resource__groups__participants = user))))).distinct() + else: + posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(mural_mural.last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, favorites_post__isnull = False, favorites_post__user = user) + + return posts \ No newline at end of file diff --git a/mural/views.py b/mural/views.py index d0946ee..bfe443f 100644 --- a/mural/views.py +++ b/mural/views.py @@ -29,7 +29,7 @@ from api.utils import sendMuralPushNotification from .models import Mural, GeneralPost, CategoryPost, SubjectPost, MuralVisualizations, MuralFavorites, Comment from .forms import GeneralPostForm, CategoryPostForm, SubjectPostForm, ResourcePostForm, CommentForm -from .utils import getSpaceUsers +from .utils import getSpaceUsers, getSubjectPosts from amadeus.permissions import has_subject_view_permissions, has_resource_permissions @@ -593,16 +593,7 @@ def load_subject_posts(request, subject): showing = request.GET.get('showing', '') n_views = 0 - if not favorites: - if mines: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, mural_ptr__user = user) - else: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject) - else: - if mines: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, favorites_post__isnull = False, favorites_post__user = user, mural_ptr__user = user) - else: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space__id = subject, favorites_post__isnull = False, favorites_post__user = user) + posts = getSubjectPosts(subject, user, favorites, mines) if showing: #Exclude ajax creation posts results showing = showing.split(',') @@ -937,16 +928,7 @@ class SubjectView(LoginRequiredMixin, LogMixin, generic.ListView): slug = self.kwargs.get('slug') subject = get_object_or_404(Subject, slug = slug) - if not favorites: - if mines: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(mural_ptr__user = user, space = subject) - else: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(space = subject) - else: - if mines: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(favorites_post__isnull = False, favorites_post__user = user, mural_ptr__user = user, space = subject) - else: - posts = SubjectPost.objects.extra(select = {"most_recent": "greatest(last_update, (select max(mural_comment.last_update) from mural_comment where mural_comment.post_id = mural_subjectpost.mural_ptr_id))"}).filter(favorites_post__isnull = False, favorites_post__user = user, space = subject) + posts = getSubjectPosts(subject, user, favorites, mines) if showing: #Exclude ajax creation posts results showing = showing.split(',') -- libgit2 0.21.2