浏览代码

AMBARI-3506. User can't go next if install process failed. (onechiporenko)

Oleg Nechiporenko 11 年之前
父节点
当前提交
b8c835b553
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 2 1
      ambari-web/app/controllers/wizard/step9_controller.js
  2. 5 0
      ambari-web/test/installer/step9_test.js

+ 2 - 1
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'));

+ 5 - 0
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},