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

Fixed GUI rule matching

Browse source
This commit is contained in:
Joel Collins 2020-02-18 15:57:28 +00:00
parent 4521837c45
commit d39f897531
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,10 +7,18 @@ 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)
logging.debug(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"]:
# Clean leading slashes from rule
if "route" in form:
while form["route"][0] == "/":
form["route"] = form["route"][1:]
# 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():
logging.debug(f"Expanding {form}")
form["route"] = extension_object._rules[form["route"]]["rule"] form["route"] = extension_object._rules[form["route"]]["rule"]
else: else:
logging.warn( logging.warn(