keycloak-uncached
Changes
themes/src/main/resources/theme/base/admin/resources/partials/authz/permission/resource-server-permission-list.html 4(+2 -2)
themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/resource-server-policy-list.html 4(+2 -2)
Details
diff --git a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
index dc7070c..6fab666 100644
--- a/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/authz/authz-controller.js
@@ -229,7 +229,11 @@ module.controller('ResourceServerResourceCtrl', function($scope, $http, $route,
});
}
- $scope.showDetails = function(item) {
+ $scope.showDetails = function(item, event) {
+ if (event.target.localName == 'a' || event.target.localName == 'button') {
+ return;
+ }
+
if (item) {
$scope.loadDetails(item);
} else {
@@ -525,7 +529,10 @@ module.controller('ResourceServerScopeCtrl', function($scope, $http, $route, $lo
});
}
- $scope.showDetails = function(item) {
+ $scope.showDetails = function(item, event) {
+ if (event.target.localName == 'a' || event.target.localName == 'button') {
+ return;
+ }
if (item) {
$scope.loadDetails(item);
} else {
@@ -727,7 +734,10 @@ module.controller('ResourceServerPolicyCtrl', function($scope, $http, $route, $l
});
}
- $scope.showDetails = function(item) {
+ $scope.showDetails = function(item, event) {
+ if (event.target.localName == 'a' || event.target.localName == 'button') {
+ return;
+ }
if (item) {
$scope.loadDetails(item);
} else {
@@ -829,7 +839,10 @@ module.controller('ResourceServerPermissionCtrl', function($scope, $http, $route
});
}
- $scope.showDetails = function(item) {
+ $scope.showDetails = function(item, event) {
+ if (event.target.localName == 'a' || event.target.localName == 'button') {
+ return;
+ }
if (item) {
$scope.loadDetails(item);
} else {
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/authz/permission/resource-server-permission-list.html b/themes/src/main/resources/theme/base/admin/resources/partials/authz/permission/resource-server-permission-list.html
index 98ca2ae..40dfacd 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/authz/permission/resource-server-permission-list.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/authz/permission/resource-server-permission-list.html
@@ -72,7 +72,7 @@
</tr>
</tfoot>
<tbody>
- <tr ng-repeat-start="policy in policies | filter: {name: search.name, type: search.type} | orderBy:'name'" data-ng-click="showDetails(policy);" style="cursor: pointer">
+ <tr ng-repeat-start="policy in policies | filter: {name: search.name, type: search.type} | orderBy:'name'" data-ng-click="showDetails(policy, $event);" style="cursor: pointer">
<td>
<span ng-if="!policy.details || !policy.details.loaded" class="fa fa-angle-right"></span>
<span ng-if="policy.details && policy.details.loaded" class="fa fa-angle-right fa-angle-down"></span>
@@ -90,7 +90,7 @@
<tr ng-if="policy.details && policy.details.loaded" ng-repeat-end="">
<td colspan="5" style="background-color: #ffffff">
<div class="list-group-item-container container-fluid">
- <div class="close" data-ng-click="showDetails(policy);" style="padding-top: 10px">
+ <div class="close" data-ng-click="showDetails(policy, $event);" style="padding-top: 10px">
<span class="pficon pficon-close"></span>
</div>
<div class="row">
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/resource-server-policy-list.html b/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/resource-server-policy-list.html
index a7ecfa1..ac790bb 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/resource-server-policy-list.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/authz/policy/resource-server-policy-list.html
@@ -71,7 +71,7 @@
</tr>
</tfoot>
<tbody>
- <tr ng-repeat-start="policy in policies | filter: {name: search.name, type: search.type} | orderBy:'name'" data-ng-click="showDetails(policy);" style="cursor: pointer">
+ <tr ng-repeat-start="policy in policies | filter: {name: search.name, type: search.type} | orderBy:'name'" data-ng-click="showDetails(policy, $event);" style="cursor: pointer">
<td>
<span ng-if="!policy.details || !policy.details.loaded" class="fa fa-angle-right"></span>
<span ng-if="policy.details && policy.details.loaded" class="fa fa-angle-right fa-angle-down"></span>
@@ -89,7 +89,7 @@
<tr ng-if="policy.details && policy.details.loaded" ng-repeat-end="">
<td colspan="5" style="background-color: #ffffff">
<div class="list-group-item-container container-fluid">
- <div class="close" data-ng-click="showDetails(policy);" style="padding-top: 10px">
+ <div class="close" data-ng-click="showDetails(policy, $event);" style="padding-top: 10px">
<span class="pficon pficon-close"></span>
</div>
<div class="row">
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-resource-list.html b/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-resource-list.html
index e2cea1a..c9152c0 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-resource-list.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-resource-list.html
@@ -95,7 +95,7 @@
</tr>
</tfoot>
<tbody>
- <tr ng-repeat-start="resource in resources | filter:search | orderBy:'name'" data-ng-click="showDetails(resource);" style="cursor: pointer;">
+ <tr ng-repeat-start="resource in resources | filter:search | orderBy:'name'" data-ng-click="showDetails(resource, $event);" style="cursor: pointer;">
<td>
<span ng-if="!resource.details || !resource.details.loaded" class="fa fa-angle-right"></span>
<span ng-if="resource.details && resource.details.loaded" class="fa fa-angle-right fa-angle-down"></span>
@@ -128,7 +128,7 @@
<tr ng-if="resource.details && resource.details.loaded" ng-repeat-end="">
<td colspan="6" style="background-color: #ffffff">
<div class="list-group-item-container container-fluid">
- <div class="close" data-ng-click="showDetails(resource);" style="padding-top: 10px">
+ <div class="close" data-ng-click="showDetails(resource, $event);" style="padding-top: 10px">
<span class="pficon pficon-close"></span>
</div>
<div class="row">
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-scope-list.html b/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-scope-list.html
index 34ce2b0..22c7f38 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-scope-list.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/authz/resource-server-scope-list.html
@@ -46,7 +46,7 @@
</tr>
</tfoot>
<tbody>
- <tr ng-repeat-start="scope in scopes | filter:search | orderBy:'name'" data-ng-click="showDetails(scope);" style="cursor: pointer">
+ <tr ng-repeat-start="scope in scopes | filter:search | orderBy:'name'" data-ng-click="showDetails(scope, $event);" style="cursor: pointer">
<td>
<span ng-if="!scope.details || !scope.details.loaded" class="fa fa-angle-right"></span>
<span ng-if="scope.details && scope.details.loaded" class="fa fa-angle-right fa-angle-down"></span>
@@ -69,7 +69,7 @@
<tr ng-if="scope.details && scope.details.loaded" ng-repeat-end="">
<td colspan="3" style="background-color: #ffffff">
<div class="list-group-item-container container-fluid">
- <div class="close" data-ng-click="showDetails(scope);" style="padding-top: 10px">
+ <div class="close" data-ng-click="showDetails(scope, $event);" style="padding-top: 10px">
<span class="pficon pficon-close"></span>
</div>
<div class="row">