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

Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master

Browse source
This commit is contained in:
Joel Collins 2020-10-16 15:42:17 +01:00
commit e6913b23e2
5 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/api/app.py
View file

@ -105,10 +105,10 @@ for extension in find_extensions(OPENFLEXURE_EXTENSIONS_PATH):
labthing.add_view(views.CaptureList, "/captures")
labthing.add_root_link(views.CaptureList, "captures")
labthing.add_view(views.CaptureView, "/captures/<id>")
labthing.add_view(views.CaptureDownload, "/captures/<id>/download/<filename>")
labthing.add_view(views.CaptureTags, "/captures/<id>/tags")
labthing.add_view(views.CaptureAnnotations, "/captures/<id>/annotations")
labthing.add_view(views.CaptureView, "/captures/<id_>")
labthing.add_view(views.CaptureDownload, "/captures/<id_>/download/<filename>")
labthing.add_view(views.CaptureTags, "/captures/<id_>/tags")
labthing.add_view(views.CaptureAnnotations, "/captures/<id_>/annotations")
# Attach settings and state resources
labthing.add_view(views.SettingsProperty, "/instrument/settings")

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

@ -49,18 +49,18 @@ class CaptureSchema(Schema):
def generate_links(self, data, **_):
data.links = {
"self": {
"href": url_for(CaptureView.endpoint, id=data.id, _external=True),
"href": url_for(CaptureView.endpoint, id_=data.id, _external=True),
"mimetype": "application/json",
**description_from_view(CaptureView),
},
"tags": {
"href": url_for(CaptureTags.endpoint, id=data.id, _external=True),
"href": url_for(CaptureTags.endpoint, id_=data.id, _external=True),
"mimetype": "application/json",
**description_from_view(CaptureTags),
},
"annotations": {
"href": url_for(
CaptureAnnotations.endpoint, id=data.id, _external=True
CaptureAnnotations.endpoint, id_=data.id, _external=True
),
"mimetype": "application/json",
**description_from_view(CaptureAnnotations),
@ -68,7 +68,7 @@ class CaptureSchema(Schema):
"download": {
"href": url_for(
CaptureDownload.endpoint,
id=data.id,
id_=data.id,
filename=data.name,
_external=True,
),