nav improvements

This commit is contained in:
Bill Burke 2013-08-04 20:52:03 -04:00
parent fb45fcc5fd
commit 22b28cb023
2 changed files with 17 additions and 13 deletions

View file

@ -5,7 +5,7 @@ var module = angular.module('keycloak.controllers', [ 'keycloak.services' ]);
var realmslist = {};
module.controller('GlobalCtrl', function($scope, $http, Auth, $location, Notifications) {
module.controller('GlobalCtrl', function($scope, $http, Auth, Current, $location, Notifications) {
$scope.addMessage = function() {
Notifications.success("test");
};
@ -19,6 +19,7 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, $location, Notific
});
$http.get('/auth-server/rest/saas/admin/realms').success(function(data) {
Current.realms = data;
var count = 0;
var showrealm = false;
var id = null;
@ -34,6 +35,7 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, $location, Notific
if (showrealm) {
console.log('redirecting');
Current.realm = Current.realms[id];
$location.url("/realms/" + id);
} else {
console.log('not redirecting');
@ -158,22 +160,28 @@ module.controller('RealmListCtrl', function($scope, Realm, Current) {
Current.realms = $scope.realms;
});
module.controller('RealmDropdownCtrl', function($scope, Realm, Current, $location) {
console.log('test log writing');
Current.realms = Realm.get();
module.controller('RealmDropdownCtrl', function($scope, Realm, Current, Auth, $location) {
// Current.realms = Realm.get();
$scope.current = Current;
$scope.changeRealm = function() {
console.log('select box changed');
for (var id in Current.realms) {
var val = Current.realms[id];
console.log('checking: ' + val);
if (val == Current.realm) {
console.log("redirect to: /realms/" + id);
$location.url("/realms/" + id);
break;
}
}
};
$scope.showNav = function() {
var show = false;
for (var key in Current.realms) {
if (typeof Current.realms[key] != "function") {
show = true;
break;
}
}
return Auth.loggedIn && show;
}
});
module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $location, Dialog, Notifications) {
@ -275,10 +283,6 @@ module.controller('RealmDetailCtrl', function($scope, Current, Realm, realm, $lo
var data = Realm.get(function() {
Current.realms = data;
Current.realm = Current.realms[id];
console.log('Current.realms[id]: ' + Current.realms[id]);
console.log('data[id]: ' + data[id]);
console.log('Current.realm.name: ' + Current.realm.name);
});
$location.url("/realms/" + id);
Notifications.success("Created realm");

View file

@ -12,8 +12,8 @@
</ul>
</li>
</ul> -->
<h3 data-ng-show="auth.loggedIn"><span class="gray pull-left">Realm: </span></h3>
<select class="nav pull-left" data-ng-show="auth.loggedIn" ng-change="changeRealm()" ng-model="current.realm" ng-options="name for (id, name) in current.realms">
<h3 data-ng-show="showNav()"><span class="gray pull-left">Realm: </span></h3>
<select class="nav pull-left" data-ng-show="showNav()" ng-change="changeRealm()" ng-model="current.realm" ng-options="name for (id, name) in current.realms">
</select>
<!-- <select class="nav pull-left" ng-options="r.name for r in current.realms"></select> -->
</div>