You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/06/17 20:03:22 UTC
ambari git commit: AMBARI-11981. Install Wizard: step9 opens every
time after page refresh after install failed (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 76b211fa7 -> d7df0c393
AMBARI-11981. Install Wizard: step9 opens every time after page refresh after install failed (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7df0c39
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7df0c39
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7df0c39
Branch: refs/heads/trunk
Commit: d7df0c3930be64ff6c1f15b3333ccec90725ef2a
Parents: 76b211f
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Jun 17 21:00:43 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Jun 17 21:03:07 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 2 +-
ambari-web/app/mixins/routers/redirections.js | 10 +---------
ambari-web/app/models/cluster_states.js | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7df0c39/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index d85b126..49b9700 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -209,7 +209,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
clusterName: this.get('clusterName'),
clusterState: 'CLUSTER_NOT_CREATED_1',
wizardControllerName: 'installerController',
- localdb: App.db.data
+ localdb: {}
});
}
if ((this.get('currentStep') - step) > 1 && !disableNaviWarning) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7df0c39/ambari-web/app/mixins/routers/redirections.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/routers/redirections.js b/ambari-web/app/mixins/routers/redirections.js
index 574cc5c..2e605be 100644
--- a/ambari-web/app/mixins/routers/redirections.js
+++ b/ambari-web/app/mixins/routers/redirections.js
@@ -49,15 +49,7 @@ App.RouterRedirections = Em.Mixin.create({
var path = isOnInstaller ? '' : 'installer.';
switch (currentClusterStatus.clusterState) {
case 'CLUSTER_NOT_CREATED_1' :
- var localDb = currentClusterStatus.localdb;
- if (localDb && localDb.Installer && localDb.Installer.currentStep) {
- App.db.data = currentClusterStatus.localdb;
- App.get('router').setAuthenticated(true);
- var controllerName = installerController.get('name');
- var suffixLength = 10;
- var currentStep = App.get('router').getWizardCurrentStep(controllerName.substr(0, controllerName.length - suffixLength));
- installerController.setCurrentStep(currentStep);
- }
+ App.get('router').setAuthenticated(true);
router.transitionTo(path + 'step' + installerController.get('currentStep'));
break;
case 'CLUSTER_DEPLOY_PREP_2' :
http://git-wip-us.apache.org/repos/asf/ambari/blob/d7df0c39/ambari-web/app/models/cluster_states.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/cluster_states.js b/ambari-web/app/models/cluster_states.js
index 7866f47..9f3ccac 100644
--- a/ambari-web/app/models/cluster_states.js
+++ b/ambari-web/app/models/cluster_states.js
@@ -134,7 +134,7 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
if (response.wizardControllerName) {
this.set('wizardControllerName', response.wizardControllerName);
}
- if (response.localdb) {
+ if (response.localdb && !$.isEmptyObject(response.localdb)) {
this.set('localdb', response.localdb);
// restore HAWizard data if process was started
var isHAWizardStarted = App.isAccessible('ADMIN') && !App.isEmptyObject(response.localdb.HighAvailabilityWizard);