Merge branch 'master' into ticket/lipisha-accounts

onepercentclub · Sep 5, 2022 · b00a6b7 · b00a6b7
2 parents bf17949 + 1a9d4dd
commit b00a6b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/bluebottle/impact/urls/api.py b/bluebottle/impact/urls/api.py
@@ -3,11 +3,16 @@
 from bluebottle.impact.views import (
     ImpactTypeList,
     ImpactGoalList,
-    ImpactGoalDetail
+    ImpactGoalDetail, ImpactTypeDetail
 )
 
 urlpatterns = [
     url(r'^types$', ImpactTypeList.as_view(), name='impact-type-list'),
+    url(
+        r'^types/(?P<pk>\d+)$',
+        ImpactTypeDetail.as_view(),
+        name='impact-details'
+    ),
     url(r'^goals$', ImpactGoalList.as_view(), name='impact-goal-list'),
     url(
         r'^goals/(?P<pk>\d+)$',

diff --git a/bluebottle/impact/views.py b/bluebottle/impact/views.py
@@ -11,7 +11,7 @@
     JsonApiViewMixin,
     ListAPIView,
     CreateAPIView,
-    RetrieveUpdateDestroyAPIView
+    RetrieveUpdateDestroyAPIView, RetrieveAPIView
 )
 from bluebottle.utils.permissions import TenantConditionalOpenClose
 
@@ -33,6 +33,15 @@ class ImpactTypeList(JsonApiViewMixin, ListAPIView):
     filter_backends = (ImpactTypeSearchFilter, )
 
 
+class ImpactTypeDetail(JsonApiViewMixin, RetrieveAPIView):
+    queryset = ImpactType.objects.filter(active=True)
+
+    permission_classes = [TenantConditionalOpenClose, ]
+    serializer_class = ImpactTypeSerializer
+    pagination_class = ImpactTypePagination
+    filter_backends = (ImpactTypeSearchFilter, )
+
+
 class ImpactGoalList(JsonApiViewMixin, CreateAPIView):
     queryset = ImpactGoal.objects.filter()