Commit 5c27ae5a authored by Joel Collins's avatar Joel Collins
Browse files

Fixed extension rule matching

parent 2b33c7fd
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ import logging
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):
    # Make a working copy of 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"]:
            # Clean leading slashes from rule
            if "route" in form:
                while form["route"][0] == "/":
                    form["route"] = form["route"][1:]
                form["route"] = clean_rule(form["route"])
            # Match rule in extension object
            if "route" in form and form["route"] in extension_object._rules.keys():
                form["route"] = extension_object._rules[form["route"]]["rule"]