This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
View the commit online: https://github.com/apache/ambari/commit/ddcd748bee64427e5ef4110650a15bafb3a3c1e0 The following commit(s) were added to refs/heads/branch-2.7 by this push: new ddcd748 AMBARI-25419. Add option to disable URL credential auto-update behaviour new 622acff Merge pull request #3131 from hiveww/AMBARI-25419-branch-2.7 ddcd748 is described below commit ddcd748bee64427e5ef4110650a15bafb3a3c1e0 Author: Alex Antonenko <aantone...@hortonworks.com> AuthorDate: Wed Nov 20 12:24:36 2019 +0200 AMBARI-25419. Add option to disable URL credential auto-update behaviour --- .../scripts/controllers/stackVersions/StackVersionsCreateCtrl.js | 7 +++++-- .../app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js | 5 ++++- ambari-web/app/config.js | 3 ++- ambari-web/app/views/wizard/step1_view.js | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js index 2a6c3f9..39a8d3a 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js @@ -18,8 +18,8 @@ 'use strict'; angular.module('ambariAdminConsole') -.controller('StackVersionsCreateCtrl', ['$scope', 'Stack', 'Utility', '$routeParams', '$location', '$timeout' ,'Alert', '$translate', 'Cluster', 'AddRepositoryModal', 'AddVersionModal', 'ConfirmationModal', - function($scope, Stack, Utility, $routeParams, $location, $timeout, Alert, $translate, Cluster, AddRepositoryModal, AddVersionModal, ConfirmationModal) { +.controller('StackVersionsCreateCtrl', ['$scope', '$rootScope', 'Stack', 'Utility', '$routeParams', '$location', '$timeout' ,'Alert', '$translate', 'Cluster', 'AddRepositoryModal', 'AddVersionModal', 'ConfirmationModal', + function($scope, $rootScope, Stack, Utility, $routeParams, $location, $timeout, Alert, $translate, Cluster, AddRepositoryModal, AddVersionModal, ConfirmationModal) { var $t = $translate.instant; $scope.constants = { os: $t('versions.os') @@ -448,6 +448,9 @@ angular.module('ambariAdminConsole') }; $scope.setUsernameAndPasswordsIfNeeded = function(repo) { + if ($rootScope.supports.disableCredentialsAutocompleteForRepoUrls) { + return; + } try { var urlObject = new URL(repo.Repositories.base_url); var username = urlObject.username; diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js index e1f6b4f..6877344 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js @@ -18,7 +18,7 @@ 'use strict'; angular.module('ambariAdminConsole') -.controller('StackVersionsEditCtrl', ['$scope', '$location', 'Cluster', 'Stack', '$routeParams', 'ConfirmationModal', 'Alert', '$translate', 'AddRepositoryModal', function($scope, $location, Cluster, Stack, $routeParams, ConfirmationModal, Alert, $translate, AddRepositoryModal) { +.controller('StackVersionsEditCtrl', ['$scope', '$rootScope', '$location', 'Cluster', 'Stack', '$routeParams', 'ConfirmationModal', 'Alert', '$translate', 'AddRepositoryModal', function($scope, $rootScope, $location, Cluster, Stack, $routeParams, ConfirmationModal, Alert, $translate, AddRepositoryModal) { var $t = $translate.instant; $scope.constants = { os: $t('versions.os') @@ -323,6 +323,9 @@ angular.module('ambariAdminConsole') }; $scope.onRepoUrlChange = function(repo) { + if ($rootScope.supports.disableCredentialsAutocompleteForRepoUrls) { + return; + } try { var urlObject = new URL(repo.Repositories.base_url); var username = urlObject.username; diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 496794a..f351c16 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -90,7 +90,8 @@ App.supports = { manageJournalNode: true, enableToggleKerberos: true, enableAddDeleteServices: true, - regenerateKeytabsOnSingleHost: false + regenerateKeytabsOnSingleHost: false, + disableCredentialsAutocompleteForRepoUrls: false }; if (App.enableExperimental) { diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js index eb107b9..5141b87 100644 --- a/ambari-web/app/views/wizard/step1_view.js +++ b/ambari-web/app/views/wizard/step1_view.js @@ -324,7 +324,7 @@ App.WizardStep1View = Em.View.extend({ }); } }, this); - if (changedRepo) { + if (changedRepo && !App.supports.disableCredentialsAutocompleteForRepoUrls) { try { var urlObject = new URL(changedRepo.get('baseUrl')); } catch (e) {
