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

Fixed rule expansion for LabThings 0.6.2

Browse source
This commit is contained in:
Joel Collins 2020-05-18 15:39:34 +01:00
parent 49d677a56b
commit b8c0ca257c
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/utilities/gui.py
View file

@ -13,6 +13,10 @@ def build_gui_from_dict(gui_description, extension_object):
# Make a working copy of GUI description # Make a working copy of GUI description
api_gui = copy.deepcopy(gui_description) api_gui = copy.deepcopy(gui_description)
print("")
print(extension_object)
print(extension_object._rules)
# Expand shorthand routes into full relative URLs # Expand shorthand routes into full relative URLs
if "forms" in gui_description and isinstance(api_gui["forms"], list): if "forms" in gui_description and isinstance(api_gui["forms"], list):
for form in api_gui["forms"]: for form in api_gui["forms"]:
@ -21,7 +25,7 @@ def build_gui_from_dict(gui_description, extension_object):
form["route"] = clean_rule(form["route"]) form["route"] = clean_rule(form["route"])
# Match rule in extension object # Match rule in extension object
if "route" in form and form["route"] in extension_object._rules.keys(): if "route" in form and form["route"] in extension_object._rules.keys():
form["route"] = extension_object._rules[form["route"]]["rule"] form["route"] = extension_object._rules[form["route"]]["urls"][0]
else: else:
logging.warn( logging.warn(
"No valid expandable route found for {}".format(form["route"]) "No valid expandable route found for {}".format(form["route"])