agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ftl script bug and definitively address #512 and #432

Browse Source
This commit is contained in:
Joseph Garrone 2024-02-27 06:54:10 +01:00
parent 481131d58b
commit e8fce5f796
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
View File

@ -408,6 +408,14 @@
out["themeName"] = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer"; out["themeName"] = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer";
out["pageId"] = "${pageId}"; out["pageId"] = "${pageId}";
try {
out["url"]["resourcesCommonPath"] = out["url"]["resourcesPath"] + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
} catch(error) {
}
return out; return out;
})() })()
@ -423,7 +431,7 @@
<#if isHash> <#if isHash>
<#if path?size gt 10> <#if path?size gt 10>
<#return "ABORT: Too many recursive calls"> <#return "ABORT: Too many recursive calls, path: " + path?join(".")>
</#if> </#if>
<#local keys = ""> <#local keys = "">
@ -481,13 +489,14 @@
!["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key) !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key)
) || ( ) || (
"applications.ftl" == pageId && "applications.ftl" == pageId &&
are_same_path(path, ["applications", "applications", "*", "client", "realm"]) is_subpath(path, ["applications", "applications"]) &&
) || ( (
"applications.ftl" == pageId && key == "realm" ||
"masterAdminClient" == key key == "container"
)
) )
> >
<#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]> <#local out_seq += ["/*If you need '" + path?join(".") + "." + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
<#continue> <#continue>
</#if> </#if>
@ -656,9 +665,9 @@
<#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non enumerable object"> <#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non enumerable object">
</#function> </#function>
<#function are_same_path path searchedPath> <#function is_subpath path searchedPath>
<#if path?size != searchedPath?size> <#if path?size < searchedPath?size>
<#return false> <#return false>
</#if> </#if>
@ -666,8 +675,14 @@
<#list path as property> <#list path as property>
<#if i == searchedPath?size >
<#continue>
</#if>
<#local searchedProperty=searchedPath[i]> <#local searchedProperty=searchedPath[i]>
<#local i+= 1>
<#if searchedProperty?is_string && searchedProperty == "*"> <#if searchedProperty?is_string && searchedProperty == "*">
<#continue> <#continue>
</#if> </#if>
@ -684,11 +699,13 @@
<#return false> <#return false>
</#if> </#if>
<#local i+= 1>
</#list> </#list>
<#return true> <#return true>
</#function> </#function>
<#function are_same_path path searchedPath>
<#return path?size == searchedPath?size && is_subpath(path, searchedPath)>
</#function>
</script> </script>