Skip to content

Commit

Permalink
Merge pull request #1108 from xzzy/master2
Browse files Browse the repository at this point in the history
Fix for server error when generating report
  • Loading branch information
xzzy authored Dec 9, 2024
2 parents fa70b9d + 0ceed6d commit 170075e
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions ledger/payments/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -771,12 +771,11 @@ def get(self,request,format=None):
try:
http_status = status.HTTP_200_OK
system = request.GET.get('system')

ois = payment_models.OracleInterfaceSystem.objects.filter(system_id=system)
if ois.count() > 0:
system = system.replace("S","0")
ois = payment_models.OracleInterfaceSystem.objects.filter(system_id=system)
if ois.count() > 0:
isp = payments_utils.get_oracle_interface_system_permissions(system,request.user.email)
if isp["reports_access"] is True or isp["all_access"] is True:

#parse and validate data
report = None
data = {
Expand Down Expand Up @@ -805,13 +804,13 @@ def get(self,request,format=None):
,serializer.validated_data['start'],
serializer.validated_data['end'],
district = serializer.validated_data['district'])
if report:
if report:
response = HttpResponse(FileWrapper(report), content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename="{}.csv"'.format(filename)
return response
else:
raise serializers.ValidationError('No report was generated.')
else:
else:
raise serializers.ValidationError('Forbidden Access.')
except serializers.ValidationError:
raise
Expand Down

0 comments on commit 170075e

Please sign in to comment.