Просмотр исходного кода

AMBARI-2562. Security wizard: Disable manual step popup via toggleable flag. (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1499640 13f79535-47bb-0310-9956-ffa450edef68
Jaimin Jetly 12 лет назад
Родитель
Сommit
82e938ff90

+ 1 - 0
ambari-web/app/config.js

@@ -45,6 +45,7 @@ App.supports = {
   hostOverrides: false,
   mirroring: false,
   secureCluster: true,
+  secureClusterProceedPopup: false,
   reassignMaster: false,
   stackUpgrade: false,
   capacitySchedulerUi: false,

+ 7 - 3
ambari-web/app/controllers/main/admin/security/add/step2.js

@@ -302,11 +302,15 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
 
   submit: function () {
     if (!this.get('isSubmitDisabled')) {
-      this.showHostPrincipalKeytabList();
+      if (App.supports.secureClusterProceedPopup) {
+        this.showHostPrincipalKeytabList();
+      } else {
+        App.router.send('next');
+      }
     }
   },
-  
-    doDownloadCsv: function(){
+
+  doDownloadCsv: function(){
       var blob = new Blob([this.buildCvsContent()], {type: "text/csv;charset=utf-8"});
       saveAs(blob, "host-principal-keytab-list.csv");
     },