You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2016/06/09 20:17:31 UTC
ambari git commit: AMBARI-17134 - Add support flag for user type
'JWT' (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk f42b25804 -> 4e2043de5
AMBARI-17134 - Add support flag for user type 'JWT' (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e2043de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e2043de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e2043de
Branch: refs/heads/trunk
Commit: 4e2043de5e8f0661d9fda54e5fb16cd62d744cea
Parents: f42b258
Author: Richard Zang <rz...@apache.org>
Authored: Thu Jun 9 13:15:03 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Thu Jun 9 13:15:03 2016 -0700
----------------------------------------------------------------------
ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js | 3 ++-
.../controllers/remoteClusters/RemoteClustersListCtrl.js | 2 +-
.../ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2043de/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 47b87c4..b658fb0 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
@@ -30,7 +30,8 @@ angular.module('ambariAdminConsole', [
testMode: (window.location.port == 8000),
mockDataPrefix: 'assets/data/',
isLDAPConfigurationSupported: false,
- isLoginActivitiesSupported: false
+ isLoginActivitiesSupported: false,
+ isJWTSupported: false
})
.config(['RestangularProvider', '$httpProvider', '$provide', function(RestangularProvider, $httpProvider, $provide) {
// Config Ajax-module
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2043de/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersListCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersListCtrl.js
index 4eb3633..dc3a120 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersListCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/remoteClusters/RemoteClustersListCtrl.js
@@ -18,7 +18,7 @@
'use strict';
angular.module('ambariAdminConsole')
-.controller('RemoteClustersListCtrl', ['$scope', '$routeParams', '$translate', 'RemoteCluster' ,'UserConstants', function ($scope, $routeParams, $translate, RemoteCluster, UserConstants) {
+.controller('RemoteClustersListCtrl', ['$scope', '$routeParams', '$translate', 'RemoteCluster', function ($scope, $routeParams, $translate, RemoteCluster) {
var $t = $translate.instant;
$scope.clusterName = $routeParams.clusterName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e2043de/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js
index 3c5e7b2..6318814 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersListCtrl.js
@@ -18,7 +18,7 @@
'use strict';
angular.module('ambariAdminConsole')
- .controller('UsersListCtrl',['$scope', 'User', '$modal', '$rootScope', 'UserConstants', '$translate', function($scope, User, $modal, $rootScope, UserConstants, $translate) {
+ .controller('UsersListCtrl',['$scope', 'User', '$modal', '$rootScope', 'UserConstants', '$translate', 'Settings', function($scope, User, $modal, $rootScope, UserConstants, $translate, Settings) {
var $t = $translate.instant;
$scope.constants = {
admin: $t('users.ambariAdmin'),
@@ -71,6 +71,9 @@ angular.module('ambariAdminConsole')
];
$scope.currentActiveFilter = $scope.activeFilterOptions[0];
+ if (!Settings.isJWTSupported) {
+ delete UserConstants.TYPES.JWT;
+ }
$scope.typeFilterOptions = [{ label: $t('common.all'), value: '*'}]
.concat(Object.keys(UserConstants.TYPES).map(function(key) {
return {