Browse Source

AMBARI-12408. Add Host and Add Service Wizards do not contain a Download CSV button when Kerberos is enabled. Additional. (alexantonenko)

Alex Antonenko 10 years ago
parent
commit
26d99f5724

+ 7 - 3
ambari-web/app/controllers/main/admin/kerberos/step5_controller.js

@@ -28,11 +28,13 @@ App.KerberosWizardStep5Controller = App.KerberosProgressPageController.extend({
   /**
    * get CSV data from the server
    */
-  getCSVData: function () {
+  getCSVData: function (skipDownload) {
     App.ajax.send({
       name: 'admin.kerberos.cluster.csv',
       sender: this,
-      data: {},
+      data: {
+        'skipDownload': skipDownload
+      },
       success: 'getCSVDataSuccessCallback',
       error: 'getCSVDataSuccessCallback'
     })
@@ -43,7 +45,9 @@ App.KerberosWizardStep5Controller = App.KerberosProgressPageController.extend({
    */
   getCSVDataSuccessCallback: function (data, opt, params) {
     this.set('csvData', this.prepareCSVData(data.split('\n')));
-    this.downloadCSV();
+    if(!Em.get(params, 'skipDownload')){
+      this.downloadCSV();
+    }
   },
 
   prepareCSVData: function (array) {

+ 3 - 2
ambari-web/app/routes/add_service_routes.js

@@ -306,8 +306,9 @@ module.exports = App.WizardRoute.extend({
           controller.connectOutlet('wizardStep8', controller.get('content'));
         });
       });
-
-      router.get('kerberosWizardStep5Controller').getCSVData();
+      if(!!App.get('router.mainAdminKerberosController.kdc_type')){
+        router.get('kerberosWizardStep5Controller').getCSVData(true);
+      }
     },
     back: function (router) {
       var controller = router.get('addServiceController');