You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/10/14 13:00:16 UTC
git commit: AMBARI-3506. User can't go next if install process
failed. (onechiporenko)
Updated Branches:
refs/heads/trunk f8b247be7 -> b8c835b55
AMBARI-3506. User can't go next if install process failed. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/b8c835b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/b8c835b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/b8c835b5
Branch: refs/heads/trunk
Commit: b8c835b553b02549b2e8d4eb65a7f9488f24b479
Parents: f8b247b
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Mon Oct 14 13:56:25 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Mon Oct 14 13:56:25 2013 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step9_controller.js | 3 ++-
ambari-web/test/installer/step9_test.js | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b8c835b5/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index 8989e46..8496930 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -27,7 +27,8 @@ App.WizardStep9Controller = Em.Controller.extend({
isSubmitDisabled: function () {
var validStates = ['STARTED','START FAILED'];
- if (this.get('content.controllerName') == 'addHostController') {
+ var controllerName = this.get('content.controllerName');
+ if (controllerName == 'addHostController' || controllerName == 'addServiceController') {
validStates.push('INSTALL FAILED');
}
return !validStates.contains(this.get('content.cluster.status'));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/b8c835b5/ambari-web/test/installer/step9_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/installer/step9_test.js b/ambari-web/test/installer/step9_test.js
index f5f0c1e..b0bb7b2 100644
--- a/ambari-web/test/installer/step9_test.js
+++ b/ambari-web/test/installer/step9_test.js
@@ -31,6 +31,11 @@ describe('App.InstallerStep9Controller', function () {
{controllerName: 'addHostController',state: 'INSTALL FAILED',e: false},
{controllerName: 'addHostController',state: 'PENDING',e: true},
{controllerName: 'addHostController',state: 'INSTALLED',e: true},
+ {controllerName: 'addServiceController',state: 'STARTED',e: false},
+ {controllerName: 'addServiceController',state: 'START FAILED',e: false},
+ {controllerName: 'addServiceController',state: 'INSTALL FAILED',e: false},
+ {controllerName: 'addServiceController',state: 'PENDING',e: true},
+ {controllerName: 'addServiceController',state: 'INSTALLED',e: true},
{controllerName: 'installerController',state: 'STARTED',e: false},
{controllerName: 'installerController',state: 'START FAILED',e: false},
{controllerName: 'installerController',state: 'INSTALL FAILED',e: true},