You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/07/27 14:52:10 UTC
ambari git commit: AMBARI-12408. Add Host and Add Service Wizards do
not contain a Download CSV button when Kerberos is enabled. Additional.
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fcce4b619 -> 828897d27
AMBARI-12408. Add Host and Add Service Wizards do not contain a Download CSV button when Kerberos is enabled. Additional. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/828897d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/828897d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/828897d2
Branch: refs/heads/branch-2.1
Commit: 828897d27d7d2b8eddb67feecfc969e53e0c4bb9
Parents: fcce4b6
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Jul 27 15:49:19 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Jul 27 15:49:19 2015 +0300
----------------------------------------------------------------------
.../controllers/main/admin/kerberos/step5_controller.js | 10 +++++++---
ambari-web/app/routes/add_service_routes.js | 5 +++--
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/828897d2/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
index c6cbf0f..06f624c 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js
+++ b/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) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/828897d2/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index ef3375f..c454364 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -307,8 +307,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');