keycloak-uncached

Merge pull request #119 from vrockai/KEYCLOAK-189 Pair

12/5/2013 9:41:49 AM

Details

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
index 7894b09..6598992 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
@@ -562,7 +562,7 @@ module.controller('RealmSocialCtrl', function($scope, realm, Realm, $location, N
             $scope.realm.socialProviders[$scope.newProviderId+".key"]="";
             $scope.realm.socialProviders[$scope.newProviderId+".secret"]="";
             $scope.configuredProviders.push($scope.newProviderId);
-            $scope.unsetProviders.remove($scope.unsetProviders.indexOf($scope.newProviderId));
+            $scope.unsetProviders.splice($scope.unsetProviders.indexOf($scope.newProviderId),1);
             selectFirstProvider();
         }
     };
@@ -570,12 +570,12 @@ module.controller('RealmSocialCtrl', function($scope, realm, Realm, $location, N
     $scope.removeProvider = function(pId) {
         delete $scope.realm.socialProviders[pId+".key"];
         delete $scope.realm.socialProviders[pId+".secret"];
-        $scope.configuredProviders.remove($scope.configuredProviders.indexOf(pId));
+        $scope.configuredProviders.splice($scope.configuredProviders.indexOf(pId),1);
 
         // Removing from postSaveProviders, so the empty fields are not red if the provider is added to the list again
         var rId = $scope.postSaveProviders.indexOf(pId);
         if (rId > -1){
-            $scope.postSaveProviders.remove(rId)
+            $scope.postSaveProviders.splice(rId,1)
         }
 
         $scope.unsetProviders.push(pId);
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html
index 40739e8..158a787 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-menu.html
@@ -1,5 +1,7 @@
 <ul data-ng-hide="createRealm">
-    <li data-ng-class="(!path[2] || path[1] == 'role' || path[2] == 'roles' || path[2] == 'token-settings' || path[2] == 'social-settings' || path[2] == 'required-credentials' || path[2] == 'smtp-settings') && 'active'"><a href="#/realms/{{realm.id}}">Settings</a></li>
+    <li data-ng-class="(!path[2] || path[1] == 'role' || path[2] == 'roles' || path[2] == 'token-settings' ||
+    path[2] == 'social-settings' || path[2] == 'required-credentials' || path[2] == 'registration-settings' ||
+    path[2] == 'keys-settings' || path[2] == 'smtp-settings') && 'active'"><a href="#/realms/{{realm.id}}">Settings</a></li>
     <li data-ng-class="(path[2] == 'users' || path[1] == 'user') && 'active'"><a href="#/realms/{{realm.id}}/users">Users</a>
     </li>
     <li data-ng-class="(path[2] == 'applications' || path[1] == 'application') && 'active'"><a href="#/realms/{{realm.id}}/applications">Applications</a></li>