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

Browse source
This commit is contained in:
Joel Collins 2020-03-04 22:06:11 +00:00
commit 4edf07be15
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,12 @@ import logging
from functools import wraps from functools import wraps
def clean_rule(rule: str):
while rule[0] == "/":
rule = rule[1:]
return f"/{rule}"
def build_gui_from_dict(gui_description, extension_object): 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)
@ -12,8 +18,7 @@ def build_gui_from_dict(gui_description, extension_object):
for form in api_gui["forms"]: for form in api_gui["forms"]:
# Clean leading slashes from rule # Clean leading slashes from rule
if "route" in form: if "route" in form:
while form["route"][0] == "/": form["route"] = clean_rule(form["route"])
form["route"] = form["route"][1:]
# 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"]]["rule"]