Merge branch 'develop' into feature/oneplus-300

oneplus/com_views.py

@@ -288,11 +288,12 @@ def post():
 def blog_hero(request, state, user):
     # get blog entry
     _course = Participant.objects.get(pk=user["participant_id"]).classs.course
+    post_list = CoursePostRel.objects.filter(course=_course).values_list('post__id', flat=True)
     request.session["state"]["blog_page_max"] = Post.objects.filter(
-        course=_course
+        id__in=post_list
     ).count()
     _posts = Post.objects.filter(
-        course=_course
+        id__in=post_list
     ).order_by("-publishdate")[:4]
     request.session["state"]["blog_num"] = _posts.count()
 
@@ -326,13 +327,14 @@ def post():
 def blog_list(request, state, user):
     # get blog entry
     _course = Participant.objects.get(pk=user["participant_id"]).classs.course
+    post_list = CoursePostRel.objects.filter(course=_course).values_list('post__id', flat=True)
     request.session["state"]["blog_page_max"] \
-        = Post.objects.filter(course=_course).count()
+        = Post.objects.filter(id__in=post_list).count()
 
     def get():
         request.session["state"]["blog_page"] \
             = min(10, request.session["state"]["blog_page_max"])
-        _posts = Post.objects.filter(course=_course) \
+        _posts = Post.objects.filter(id__in=post_list) \
                      .order_by("-publishdate")[:request.session["state"]["blog_page"]]
 
         return render(request, "com/bloglist.html", {"state": state,
@@ -346,7 +348,7 @@ def post():
             if request.session["state"]["blog_page"] > request.session["state"]["blog_page_max"]:
                 request.session["state"]["blog_page"] = request.session["state"]["blog_page_max"]
 
-        _posts = Post.objects.filter(course=_course).order_by("-publishdate")[:request.session["state"]["blog_page"]]
+        _posts = Post.objects.filter(id__in=post_list).order_by("-publishdate")[:request.session["state"]["blog_page"]]
 
         return render(
             request,
@@ -366,13 +368,14 @@ def post():
 def blog(request, state, user, blogid):
     # get blog entry
     _course = Participant.objects.get(pk=user["participant_id"]).classs.course
+    post_list = CoursePostRel.objects.filter(course=_course).values_list('post__id', flat=True)
     _post = Post.objects.get(pk=blogid)
     _next = Post.objects.filter(
-        course=_course,
+        id__in=post_list,
         publishdate__gt=_post.publishdate
     ).exclude(id=_post.id).order_by("publishdate").first()
     _previous = Post.objects.filter(
-        course=_course,
+        id__in=post_list,
         publishdate__lt=_post.publishdate
     ).exclude(id=_post.id).order_by("-publishdate").first()
 

oneplus/tests/test_extra_admin_tests.py

@@ -2,7 +2,7 @@
 import logging
 from auth.models import Learner, CustomUser
 from communication.models import Message, Post, PostComment, ChatGroup, ChatMessage, Report, ReportResponse, Sms, \
-    SmsQueue, Discussion
+    SmsQueue, Discussion, CoursePostRel
 from content.models import TestingQuestion, TestingQuestionOption
 from core.models import Class, Participant, ParticipantQuestionAnswer, ParticipantBadgeTemplateRel
 from django.core.urlresolvers import reverse
@@ -66,14 +66,16 @@ def create_message(self, author, course, **kwargs):
         return Message.objects.create(author=author, course=course, **kwargs)
 
     def create_post(self, name="Test Post", description="Test", content="Test content"):
-        return Post.objects.create(
+        post = Post.objects.create(
             name=name,
             description=description,
-            course=self.course,
             content=content,
             publishdate=datetime.now(),
             moderated=True
         )
+        CoursePostRel.objects.create(course=self.course, post=post)
+
+        return post
 
     def create_post_comment(self, post, author, content="Test Content"):
         return PostComment.objects.create(

oneplus/tests/test_general_tests.py

@@ -2,7 +2,8 @@
 from datetime import datetime, timedelta
 import logging
 from auth.models import Learner, CustomUser
-from communication.models import Message, Discussion, ChatGroup, ChatMessage, Profanity, Post, PostComment
+from communication.models import Message, Discussion, ChatGroup, ChatMessage, Profanity, Post, PostComment, \
+    CoursePostRel
 from content.models import TestingQuestion, TestingQuestionOption, Event, SUMit, EventStartPage, EventEndPage, \
     EventSplashPage, EventQuestionRel, EventParticipantRel, EventQuestionAnswer
 from core.models import Class, Participant, ParticipantQuestionAnswer, ParticipantRedoQuestionAnswer, \
@@ -1547,10 +1548,9 @@ def test_blog(self):
 
         blog = Post.objects.create(
             name='testblog',
-            course=self.course,
             publishdate=datetime.now()
         )
-        blog.save()
+        CoursePostRel.objects.create(course=self.course, post=blog)
 
         resp = self.client.get(
             reverse('com.blog',