Honour external edit config if it points to an edit form

Author: manisandro

themes_config.py

@@ -531,9 +531,16 @@ def getTheme(config, permissions, configItem, result, resultItem, project_settin
     if project_permissions.get('edit_config'):
         # edit config from permissions
         resultItem["editConfig"] = project_permissions.get('edit_config')
+        externalConfig = getEditConfig(configItem.get("editConfig", None))
+        if externalConfig:
+            for layer in externalConfig:
+                form = externalConfig[layer].get("form", None)
+                if form:
+                    # Replace autogenerated config with external config if a form is specified
+                    resultItem["editConfig"][layer] = externalConfig[layer]
     else:
         # get edit config from referenced JSON
-        resultItem["editConfig"] = getEditConfig(configItem["editConfig"] if "editConfig" in configItem else None);
+        resultItem["editConfig"] = getEditConfig(configItem["editConfig"] if "editConfig" in configItem else None)
 
     # set default theme
     if configItem.get('default', False) or not result["themes"]["defaultTheme"]: