You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/24 15:24:20 UTC
[5/7] ambari git commit: AMBARI-15154. Hide LDAP configuration page
from Ambari Admin (alexantonenko)
AMBARI-15154. Hide LDAP configuration page from Ambari Admin (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c561140
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c561140
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c561140
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1c561140787d6cae8784ad894a0cfd7e354a98e1
Parents: 9246125
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Feb 24 14:02:49 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Feb 24 14:02:49 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/ui/admin-web/app/scripts/app.js | 3 ++-
.../ui/admin-web/app/scripts/controllers/NavbarCtrl.js | 3 ++-
.../controllers/authentication/AuthenticationMainCtrl.js | 3 ++-
.../src/main/resources/ui/admin-web/app/scripts/routes.js | 7 ++++++-
.../resources/ui/admin-web/app/views/authentication/main.html | 2 +-
.../src/main/resources/ui/admin-web/app/views/leftNavbar.html | 2 +-
6 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index cde24e0..a0c0323 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -28,7 +28,8 @@ angular.module('ambariAdminConsole', [
.constant('Settings', {
baseUrl: '/api/v1',
testMode: (window.location.port == 8000),
- mockDataPrefix: 'assets/data/'
+ mockDataPrefix: 'assets/data/',
+ isLDAPConfigurationSupported: false
})
.config(['RestangularProvider', '$httpProvider', '$provide', function(RestangularProvider, $httpProvider, $provide) {
// Config Ajax-module
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
index f1eb5c5..cbf38e8 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
@@ -18,7 +18,7 @@
'use strict';
angular.module('ambariAdminConsole')
-.controller('NavbarCtrl',['$scope', 'Cluster', '$location', 'Alert', 'ROUTES', 'ConfirmationModal', '$rootScope', 'Stack', '$translate', function($scope, Cluster, $location, Alert, ROUTES, ConfirmationModal, $rootScope, Stack, $translate) {
+.controller('NavbarCtrl',['$scope', 'Cluster', '$location', 'Alert', 'ROUTES', 'ConfirmationModal', '$rootScope', 'Stack', '$translate', 'Settings', function($scope, Cluster, $location, Alert, ROUTES, ConfirmationModal, $rootScope, Stack, $translate, Settings) {
var $t = $translate.instant;
$scope.cluster = null;
$scope.totalRepos = 0;
@@ -26,6 +26,7 @@ angular.module('ambariAdminConsole')
name : '',
editingName : false
};
+ $scope.settings = Settings;
function loadClusterData() {
Cluster.getStatus().then(function (cluster) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
index c7b7026..bce9189 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/authentication/AuthenticationMainCtrl.js
@@ -18,8 +18,9 @@
'use strict';
angular.module('ambariAdminConsole')
- .controller('AuthenticationMainCtrl', ['$scope', '$translate', 'Alert', function ($scope, $translate, $Alert) {
+ .controller('AuthenticationMainCtrl', ['$scope', '$translate', 'Alert', 'Settings', function ($scope, $translate, $Alert, Settings) {
$scope.t = $translate.instant;
+ $scope.settings = Settings;
$scope.isLDAPEnabled = false;
$scope.connectivity = {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
index 8691195..8901738 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/routes.js
@@ -146,7 +146,12 @@ angular.module('ambariAdminConsole')
};
angular.forEach(ROUTES, createRoute);
}])
-.run(['$rootScope', 'ROUTES', function($rootScope, ROUTES) {
+.run(['$rootScope', 'ROUTES', 'Settings', function($rootScope, ROUTES, Settings) {
// Make routes available in every template and controller
$rootScope.ROUTES = ROUTES;
+ $rootScope.$on('$locationChangeStart', function (e, nextUrl) {
+ if (/\/authentication$/.test(nextUrl) && !Settings.isLDAPConfigurationSupported) {
+ e.preventDefault();
+ }
+ });
}]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/views/authentication/main.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/authentication/main.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/authentication/main.html
index 8fa1429..57ba7c9 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/authentication/main.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/authentication/main.html
@@ -16,7 +16,7 @@
* limitations under the License.
-->
-<div class="users-pane enable-ldap">
+<div class="users-pane enable-ldap" ng-show="settings.isLDAPConfigurationSupported">
<div class="clearfix">
<ol class="breadcrumb pull-left">
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c561140/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
index b0a5396..1646d7c 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
@@ -109,7 +109,7 @@
<div class="panel-heading"><span class="glyphicon glyphicon-cog"></span> {{'common.settings' | translate}}</div>
<div class="panel-body">
<ul class="nav nav-pills nav-stacked">
- <li ng-class="{active: isActive('authentication.main')}"><link-to route="authentication.main">{{'common.authentication' | translate}}</link-to></li>
+ <li ng-class="{active: isActive('authentication.main')}" ng-show="settings.isLDAPConfigurationSupported"><link-to route="authentication.main">{{'common.authentication' | translate}}</link-to></li>
<li ng-class="{active: isActive('loginActivities.loginMessage')}"><link-to route="loginActivities.loginMessage">{{'common.loginActivities.loginActivities' | translate}}</link-to></li>
</ul>
</div>