From c8c6e36fd9c0b5f048e3f32938cbc25e34e3e36d Mon Sep 17 00:00:00 2001
From: Stan Silvert <ssilvert@redhat.com>
Date: Fri, 2 Dec 2016 18:17:15 -0500
Subject: [PATCH 1/2] KEYCLOAK-4022: Server error when click Service Account
 Roles

---
 .../theme/base/admin/resources/js/controllers/clients.js       | 3 +++
 .../theme/base/admin/resources/templates/kc-tabs-client.html   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
index 564313c860..bd916bc042 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
@@ -867,6 +867,7 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, templates,
     $scope.samlForcePostBinding = false;
     $scope.samlForceNameIdFormat = false;
     $scope.disableAuthorizationTab = !client.authorizationServicesEnabled;
+    $scope.disableServiceAccountRolesTab = !client.serviceAccountsEnabled;
 
     function updateProperties() {
         if (!$scope.client.attributes) {
@@ -971,6 +972,8 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, templates,
 
         var attrVal2 = $scope.client.attributes['request.object.signature.alg'];
          $scope.requestObjectSignatureAlg = attrVal2==null ? 'any' : attrVal2;
+         
+        $scope.disableServiceAccountRolesTab = !client.serviceAccountsEnabled;
     }
 
     if (!$scope.create) {
diff --git a/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html b/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html
index e2d5db2665..365d50a178 100755
--- a/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html
+++ b/themes/src/main/resources/theme/base/admin/resources/templates/kc-tabs-client.html
@@ -39,7 +39,7 @@
             <kc-tooltip>{{:: 'installation.tooltip' | translate}}</kc-tooltip>
         </li>
 
-        <li ng-class="{active: path[4] == 'service-account-roles'}" data-ng-show="client.serviceAccountsEnabled && !(client.bearerOnly || client.publicClient)">
+        <li ng-class="{active: path[4] == 'service-account-roles'}" data-ng-show="!disableServiceAccountRolesTab && client.serviceAccountsEnabled && !(client.bearerOnly || client.publicClient)">
             <a href="#/realms/{{realm.realm}}/clients/{{client.id}}/service-account-roles">{{:: 'service-account-roles' | translate}}</a>
             <kc-tooltip>{{:: 'service-account-roles.tooltip' | translate}}</kc-tooltip>
         </li>

From aed54439c2eba9ca120a51cc93da25d1efcdab22 Mon Sep 17 00:00:00 2001
From: Stan Silvert <ssilvert@redhat.com>
Date: Fri, 2 Dec 2016 18:31:44 -0500
Subject: [PATCH 2/2] KEYCLOAK-4022: Remove unneeded line of code.

---
 .../theme/base/admin/resources/js/controllers/clients.js        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
index bd916bc042..8983c23d0e 100755
--- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
+++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/clients.js
@@ -972,8 +972,6 @@ module.controller('ClientDetailCtrl', function($scope, realm, client, templates,
 
         var attrVal2 = $scope.client.attributes['request.object.signature.alg'];
          $scope.requestObjectSignatureAlg = attrVal2==null ? 'any' : attrVal2;
-         
-        $scope.disableServiceAccountRolesTab = !client.serviceAccountsEnabled;
     }
 
     if (!$scope.create) {