libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-1475

Browse source
This commit is contained in:
Stian Thorgersen 2015-07-17 10:33:18 +02:00
parent 0bec2bcd1e
commit 676792d07d
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
forms/common-freemarker/src/main/java/org/keycloak/freemarker/ExtendingThemeManager.java
View file

@ -85,8 +85,8 @@ public class ExtendingThemeManager implements ThemeProvider {
private Theme loadTheme(String name, Theme.Type type) throws IOException { private Theme loadTheme(String name, Theme.Type type) throws IOException {
Theme theme = findTheme(name, type); Theme theme = findTheme(name, type);
if (theme != null && theme.getParentName() != null) { if (theme != null && (theme.getParentName() != null || theme.getImportName() != null)) {
List<Theme> themes = new LinkedList<Theme>(); List<Theme> themes = new LinkedList<>();
themes.add(theme); themes.add(theme);
if (theme.getImportName() != null) { if (theme.getImportName() != null) {
@ -94,13 +94,15 @@ public class ExtendingThemeManager implements ThemeProvider {
themes.add(findTheme(s[1], Theme.Type.valueOf(s[0].toUpperCase()))); themes.add(findTheme(s[1], Theme.Type.valueOf(s[0].toUpperCase())));
} }
for (String parentName = theme.getParentName(); parentName != null; parentName = theme.getParentName()) { if (theme.getParentName() != null) {
theme = findTheme(parentName, type); for (String parentName = theme.getParentName(); parentName != null; parentName = theme.getParentName()) {
themes.add(theme); theme = findTheme(parentName, type);
themes.add(theme);
if (theme.getImportName() != null) { if (theme.getImportName() != null) {
String[] s = theme.getImportName().split("/"); String[] s = theme.getImportName().split("/");
themes.add(findTheme(s[1], Theme.Type.valueOf(s[0].toUpperCase()))); themes.add(findTheme(s[1], Theme.Type.valueOf(s[0].toUpperCase())));
}
} }
} }