Merge pull request #1412 from IFRCGo/fix/docs-nonetype-to-get

Fix via coreapi/from-documenting-your-api

Author: szabozoltan69

lang/permissions.py

@@ -12,6 +12,10 @@ def has_permission(self, request, view):
         # so we'll always allow GET, HEAD or OPTIONS requests. (`view` is allowed for all)
         if request.method in permissions.SAFE_METHODS:
             return True
+        if request.method == 'POST' and \
+                hasattr(request, '_request') and request.path == '/docs/' and \
+                hasattr(view, 'basename') and view.basename == 'language':
+            return True
         return String.has_perm(request.user, view.kwargs['pk'])
 
     def has_object_permission(self, request, view, obj):

main/urls.py

@@ -193,7 +193,7 @@
     url(r'^api/v2/event/(?P<pk>\d+)', api_views.EventViewset.as_view({'get': 'retrieve'})),
     url(r'^api/v2/event/(?P<slug>[-\w]+)', api_views.EventViewset.as_view({'get': 'retrieve'}, lookup_field='slug')),
     url(r'^api/v2/exportperresults/', per_views.ExportAssessmentToCSVViewset.as_view()),
-    url(r'^docs/', include_docs_urls(title='IFRC Go API')),
+    url(r'^docs/', include_docs_urls(title='IFRC Go API', public=False)),
     url(r'^tinymce/', include('tinymce.urls')),
     url(r'^admin/', RedirectView.as_view(url='/')),
     # url(r'^', admin.site.urls),

notifications/drf_views.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from django.db.models import Q
 from django_filters import rest_framework as filters
 from rest_framework.authentication import TokenAuthentication
@@ -41,7 +41,7 @@ def get_serializer_class(self):
     def get_queryset(self):
         limit = 14  # days
         cond1 = Q(is_stood_down=True)
-        cond2 = Q(end__lt=datetime.now()-timedelta(days=limit))
+        cond2 = Q(end__lt=datetime.utcnow().replace(tzinfo=timezone.utc)-timedelta(days=limit))
         return SurgeAlert.objects.exclude(cond1 & cond2)
 
 

per/drf_views.py

@@ -338,6 +338,7 @@ def get_queryset(self):
 
 class GlobalPreparednessViewset(viewsets.ReadOnlyModelViewSet):
     """Global Preparedness Highlights"""
+    # Probably not used. E.g. no 'code' in Form
     queryset = Form.objects.all()
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsAuthenticated,)
@@ -351,13 +352,13 @@ def get_queryset(self):
             last_duedate = tmz.localize(datetime(2000, 11, 15, 9, 59, 25, 0))
         if not next_duedate:
             next_duedate = tmz.localize(datetime(2222, 11, 15, 9, 59, 25, 0))
-        queryset = FormData.objects.filter(form__updated_at__gt=last_duedate, selected_option=7).select_related('form')
+        queryset = FormData.objects.filter(form__updated_at__gt=last_duedate, selected_answer_id=7).select_related('form')
         result = []
-        for i in queryset:
-            j = {'id': i.form.id}
-            j.update({'code': i.form.code})
-            j.update({'question_id': i.question_id})
-            result.append(j)
+        # for i in queryset:
+        #     j = {'id': i.form.id}
+        #     j.update({'code': i.form.code})
+        #     j.update({'question_id': i.question_id})
+        #     result.append(j)
         return result