keycloak-memoizeit
Changes
Details
diff --git a/themes/src/main/resources/theme/base/account/messages/messages_en.properties b/themes/src/main/resources/theme/base/account/messages/messages_en.properties
index 275c248..10df8df 100755
--- a/themes/src/main/resources/theme/base/account/messages/messages_en.properties
+++ b/themes/src/main/resources/theme/base/account/messages/messages_en.properties
@@ -344,3 +344,4 @@ addPeople=Add people to share your resource with
addTeam=Add team to share your resource with
myPermissions=My Permissions
waitingforApproval=Waiting for approval
+anyPermission=Any Permission
diff --git a/themes/src/main/resources/theme/base/account/resource-detail.ftl b/themes/src/main/resources/theme/base/account/resource-detail.ftl
index 55675e7..6f27c82 100755
--- a/themes/src/main/resources/theme/base/account/resource-detail.ftl
+++ b/themes/src/main/resources/theme/base/account/resource-detail.ftl
@@ -128,7 +128,7 @@
<td>
<#if permission.scopes?size != 0>
<#list permission.scopes as scope>
- <#if scope.granted>
+ <#if scope.granted && scope.scope??>
<div class="search-box">
<#if scope.scope.displayName??>
${scope.scope.displayName}
@@ -138,6 +138,8 @@
<button class="close-icon" type="button" name="removeScope-${authorization.resource.id}-${permission.requester.username}" onclick="removeScopeElm(this.parentNode);document.forms['revokeForm-${authorization.resource.id}-${permission.requester.username}'].submit();"><i class="fa fa-times" aria-hidden="true"></i></button>
<input type="hidden" name="permission_id" value="${scope.id}"/>
</div>
+ <#else>
+ ${msg("anyPermission")}
</#if>
</#list>
<#else>
diff --git a/themes/src/main/resources/theme/base/account/resources.ftl b/themes/src/main/resources/theme/base/account/resources.ftl
index a349695..2369133 100755
--- a/themes/src/main/resources/theme/base/account/resources.ftl
+++ b/themes/src/main/resources/theme/base/account/resources.ftl
@@ -145,15 +145,19 @@
</td>
<td>
<#list permission.scopes as scope>
- <div class="search-box">
- <#if scope.scope.displayName??>
- ${scope.scope.displayName}
- <#else>
- ${scope.scope.name}
- </#if>
- <button class="close-icon" type="button" id="grant-remove-scope-${resource.name}-${permission.requester.username}-${scope.scope.name}" name="removeScope-${resource.id}-${permission.requester.username}" onclick="removeScopeElm(this.parentNode);document.forms['approveForm-${resource.id}-${permission.requester.username}']['action'].value = 'deny';document.forms['approveForm-${resource.id}-${permission.requester.username}'].submit();"><i class="fa fa-times" aria-hidden="true"></i></button>
- <input type="hidden" name="permission_id" value="${scope.id}"/>
- </div>
+ <#if scope.scope??>
+ <div class="search-box">
+ <#if scope.scope.displayName??>
+ ${scope.scope.displayName}
+ <#else>
+ ${scope.scope.name}
+ </#if>
+ <button class="close-icon" type="button" id="grant-remove-scope-${resource.name}-${permission.requester.username}-${scope.scope.name}" name="removeScope-${resource.id}-${permission.requester.username}" onclick="removeScopeElm(this.parentNode);document.forms['approveForm-${resource.id}-${permission.requester.username}']['action'].value = 'deny';document.forms['approveForm-${resource.id}-${permission.requester.username}'].submit();"><i class="fa fa-times" aria-hidden="true"></i></button>
+ <input type="hidden" name="permission_id" value="${scope.id}"/>
+ </div>
+ <#else>
+ ${msg("anyPermission")}
+ </#if>
</#list>
</td>
<td width="20%" align="middle" style="vertical-align: middle">
@@ -262,7 +266,7 @@
<ul>
<#list resource.permissions as permission>
<#list permission.scopes as scope>
- <#if scope.granted>
+ <#if scope.granted && scope.scope??>
<li>
<#if scope.scope.displayName??>
${scope.scope.displayName}
@@ -270,6 +274,8 @@
${scope.scope.name}
</#if>
</li>
+ <#else>
+ ${msg("anyPermission")}
</#if>
</#list>
</#list>
@@ -355,10 +361,14 @@
<#list resource.permissions as permission>
<#list permission.scopes as scope>
<li>
- <#if scope.scope.displayName??>
- ${scope.scope.displayName}
+ <#if scope.scope??>
+ <#if scope.scope.displayName??>
+ ${scope.scope.displayName}
+ <#else>
+ ${scope.scope.name}
+ </#if>
<#else>
- ${scope.scope.name}
+ ${msg("anyPermission")}
</#if>
</li>
</#list>