rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed capture link generator when passed a dict

Browse source
This commit is contained in:
Joel Collins 2020-10-28 10:47:10 +00:00
parent 9ff0aa331b
commit 353450dd56
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
openflexure_microscope/api/v2/views/captures.py
View file

@ -47,20 +47,27 @@ class CaptureSchema(Schema):
@pre_dump @pre_dump
def generate_links(self, data, **_): def generate_links(self, data, **_):
data.links = { if isinstance(data, dict):
capture_id = data.get("id")
capture_name = data.get("name")
else:
capture_id = data.id
capture_name = data.name
links = {
"self": { "self": {
"href": url_for(CaptureView.endpoint, id_=data.id, _external=True), "href": url_for(CaptureView.endpoint, id_=capture_id, _external=True),
"mimetype": "application/json", "mimetype": "application/json",
**description_from_view(CaptureView), **description_from_view(CaptureView),
}, },
"tags": { "tags": {
"href": url_for(CaptureTags.endpoint, id_=data.id, _external=True), "href": url_for(CaptureTags.endpoint, id_=capture_id, _external=True),
"mimetype": "application/json", "mimetype": "application/json",
**description_from_view(CaptureTags), **description_from_view(CaptureTags),
}, },
"annotations": { "annotations": {
"href": url_for( "href": url_for(
CaptureAnnotations.endpoint, id_=data.id, _external=True CaptureAnnotations.endpoint, id_=capture_id, _external=True
), ),
"mimetype": "application/json", "mimetype": "application/json",
**description_from_view(CaptureAnnotations), **description_from_view(CaptureAnnotations),
@ -68,14 +75,20 @@ class CaptureSchema(Schema):
"download": { "download": {
"href": url_for( "href": url_for(
CaptureDownload.endpoint, CaptureDownload.endpoint,
id_=data.id, id_=capture_id,
filename=data.name, filename=capture_name,
_external=True, _external=True,
), ),
"mimetype": "image/jpeg", "mimetype": "image/jpeg",
**description_from_view(CaptureDownload), **description_from_view(CaptureDownload),
}, },
} }
if isinstance(data, dict):
data["links"] = links
else:
data.links = links
return data return data