Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix exception thrown when deleting export #2600

Merged
merged 1 commit into from
May 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix exception thrown when deleting export
fix argument of type 'NoneType' is not iterable
kelvin-muchiri committed May 23, 2024
commit 30650f9d3c4c76442156cf37b911a6b1474c47af
26 changes: 25 additions & 1 deletion onadata/apps/api/tests/viewsets/test_export_viewset.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
"""
test_export_viewset module
"""

import os
from tempfile import NamedTemporaryFile

@@ -293,6 +292,31 @@ def test_export_delete(self):
response = view(request, pk=export.pk)
self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)

def test_export_delete_null_body(self):
"""Null request body is handled"""
markdown_xlsform = """
| survey |
| | type | name | label |
| | select one fruits | fruit | Fruit |

| choices |
| | list name | name | label |
| | fruits | orange | Orange |
| | fruits | mango | Mango |
"""
self._create_user_and_login()
xform = self._publish_markdown(markdown_xlsform, self.user)
bob = self.user
export = Export.objects.create(xform=xform)
export.save()
view = ExportViewSet.as_view({"delete": "destroy"})
request = self.factory.delete(
"/export", data=None, content_type="application/json"
)
force_authenticate(request, user=bob)
response = view(request, pk=export.pk)
self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)

def test_export_list_with_meta_perms(self):
"""
Test export list for forms with meta permissions.
4 changes: 3 additions & 1 deletion onadata/libs/filters.py
Original file line number Diff line number Diff line change
@@ -335,8 +335,10 @@ def _add_instance_prefix_to_dataview_filter_kwargs(self, filter_kwargs):
def _xform_filter(self, request, view, keyword, queryset=None):
"""Use XForm permissions"""
xform = request.query_params.get("xform")
if xform is None and "xform" in request.data:

if xform is None and request.data is not None and "xform" in request.data:
xform = request.data.get("xform")

dataview = request.query_params.get("dataview")
merged_xform = request.query_params.get("merged_xform")
filename = request.query_params.get("filename")