Merge pull request #176 from PROCOLLAB-github/dev

Add news url to programs, fix NewsQuerysetMixin

Author: yakser

news/mixins.py

@@ -12,14 +12,14 @@ def get_queryset_for_project(self):
         try:
             project = Project.objects.get(pk=self.kwargs.get("project_pk"))
         except Project.DoesNotExist:
-            return []
+            return News.objects.none()
         return News.objects.get_news(obj=project)
 
     def get_queryset_for_program(self):
         try:
             program = PartnerProgram.objects.get(pk=self.kwargs.get("partnerprogram_pk"))
         except PartnerProgram.DoesNotExist:
-            return []
+            return News.objects.none()
         return News.objects.get_news(obj=program)
 
     def get_queryset(self):
@@ -30,4 +30,4 @@ def get_queryset(self):
             # it's a partner program
             return self.get_queryset_for_program()
         else:
-            return []
+            return News.objects.none()

news/urls.py

@@ -1,11 +1,11 @@
 from django.urls import path
 
 
-from news.views import NewsList
+from news.views import NewsList, NewsDetail
 
 app_name = "news"
 
 urlpatterns = [
     path("", NewsList.as_view()),
-    # path("<int:pk>/", NewsDetail.as_view()),
+    path("<int:pk>/", NewsDetail.as_view()),
 ]

partner_programs/urls.py

@@ -1,5 +1,6 @@
 from django.urls import path
 
+from news.views import NewsList, NewsDetail, NewsDetailSetViewed, NewsDetailSetLiked
 from partner_programs.views import (
     PartnerProgramList,
     PartnerProgramDetail,
@@ -20,4 +21,12 @@
     path("<int:pk>/register_new/", PartnerProgramCreateUserAndRegister.as_view()),
     path("<int:pk>/set_liked/", PartnerProgramSetLiked.as_view()),
     path("<int:pk>/set_viewed/", PartnerProgramSetViewed.as_view()),
+    path("<int:partnerprogram_pk>/news/", NewsList.as_view()),
+    path("<int:partnerprogram_pk>/news/<int:pk>/", NewsDetail.as_view()),
+    path(
+        "<int:partnerprogram_pk>/news/<int:pk>/set_viewed/", NewsDetailSetViewed.as_view()
+    ),
+    path(
+        "<int:partnerprogram_pk>/news/<int:pk>/set_liked/", NewsDetailSetLiked.as_view()
+    ),
 ]