Skip to content

Commit

Permalink
Fix used-before-assignment in ManifestXCanvasView
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtylerwalls authored and chiatt committed Jun 28, 2024
1 parent 00c90d7 commit 2b1cc49
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions arches_for_science/views/manifest_x_canvas.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
from http import HTTPStatus

from django.core.exceptions import ObjectDoesNotExist
from django.views.generic import View
from arches.app.utils.response import JSONResponse
from arches_for_science.models import ManifestXDigitalResource, CanvasXDigitalResource, ManifestXCanvas

from arches.app.utils.response import JSONErrorResponse, JSONResponse
from arches_for_science.models import ManifestXDigitalResource, CanvasXDigitalResource


class ManifestXCanvasView(View):
def get(self, request):
Expand All @@ -10,13 +14,18 @@ def get(self, request):
canvas = request.GET.get("canvas", None)
if resourceid:
try:
manifest = ManifestXDigitalResource.objects.get(digitalresource=resourceid).manifest
link = ManifestXDigitalResource.objects.get(digitalresource=resourceid)
manifest = link.manifest
except ObjectDoesNotExist:
canvas = CanvasXDigitalResource.objects.get(digitalresource=resourceid).canvas
link = CanvasXDigitalResource.objects.get(digitalresource=resourceid)
canvas = link.canvas
digital_resource = link.digitalresource
elif manifest:
digital_resource = ManifestXDigitalResource.objects.get(manifest=manifest).digitalresource
elif canvas:
digital_resource = CanvasXDigitalResource.objects.get(canvas=canvas).digitalresource
else:
return JSONErrorResponse(status=HTTPStatus.BAD_REQUEST)

result = {"manifest": manifest, "canvas": canvas, "digital_resource": digital_resource}

Expand Down

0 comments on commit 2b1cc49

Please sign in to comment.