Commit d39f8975 authored by Joel Collins's avatar Joel Collins
Browse files

Fixed GUI rule matching

parent 4521837c

openflexure_microscope/api/utilities/gui.py

+8 −0
Original line number Diff line number Diff line
@@ -7,10 +7,18 @@ def build_gui_from_dict(gui_description, extension_object): 
    # Make a working copy of GUI description

    api_gui = copy.deepcopy(gui_description)



    logging.debug(extension_object._rules)



    # Expand shorthand routes into full relative URLs

    if "forms" in gui_description and isinstance(api_gui["forms"], list):

        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():

                logging.debug(f"Expanding {form}")

                form["route"] = extension_object._rules[form["route"]]["rule"]

            else:

                logging.warn(