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/06/21 21:40:44 UTC
ambari git commit: AMBARI-12058. Add Service Wizard. After page
refresh on step 7,
8 all left-menu items are available for a while (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk bb02ff733 -> 564948ff5
AMBARI-12058. Add Service Wizard. After page refresh on step 7, 8 all left-menu items are available for a while (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/564948ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/564948ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/564948ff
Branch: refs/heads/trunk
Commit: 564948ff514fb9b87a3d479c20c50a4919d70da6
Parents: bb02ff7
Author: Alex Antonenko <hi...@gmail.com>
Authored: Sun Jun 21 22:27:55 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sun Jun 21 22:40:39 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/add_controller.js | 2 +-
ambari-web/app/routes/add_service_routes.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/564948ff/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 5e5491e..1a5cd98 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -252,7 +252,7 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
loadMasterComponentHosts: function () {
this._super();
this.set('content.skipMasterStep', App.StackService.find().filterProperty('isSelected').filterProperty('hasMaster').everyProperty('isInstalled', true));
- this.get('isStepDisabled').findProperty('step', 2).set('value', this.get('content.skipMasterStep'));
+ this.get('isStepDisabled').findProperty('step', 2).set('value', this.get('content.skipMasterStep') || (this.get('currentStep') == 7 || this.get('currentStep') == 8));
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/564948ff/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 dcc1dae..2df6c99 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -331,13 +331,13 @@ module.exports = App.WizardRoute.extend({
console.log('in addService.step6:connectOutlets');
var controller = router.get('addServiceController');
controller.setCurrentStep('7');
+ if (!App.get('testMode')) { //if test mode is ON don't disable prior steps link.
+ controller.setLowerStepsDisable(7);
+ }
controller.dataLoading().done(function () {
controller.loadAllPriorSteps().done(function () {
var wizardStep9Controller = router.get('wizardStep9Controller');
wizardStep9Controller.set('wizardController', controller);
- if (!App.get('testMode')) { //if test mode is ON don't disable prior steps link.
- controller.setLowerStepsDisable(7);
- }
controller.connectOutlet('wizardStep9', controller.get('content'));
});
});
@@ -380,9 +380,9 @@ module.exports = App.WizardRoute.extend({
console.log('in addService.step7:connectOutlets');
var controller = router.get('addServiceController');
controller.setCurrentStep('8');
+ controller.setLowerStepsDisable(8);
controller.dataLoading().done(function () {
controller.loadAllPriorSteps().done(function () {
- controller.setLowerStepsDisable(8);
controller.connectOutlet('wizardStep10', controller.get('content'));
});
});