Преглед на файлове

AMBARI-4890 Disable component start when state is unknown. (atkach)

atkach преди 11 години
родител
ревизия
1a66462b60

+ 1 - 1
ambari-web/app/controllers/main/host/details.js

@@ -1229,7 +1229,7 @@ App.MainHostDetailsController = Em.Controller.extend({
       reassignMasterController.saveComponentToReassign(component);
       reassignMasterController.getSecurityStatus();
       reassignMasterController.setCurrentStep('1');
-      App.router.transitionTo('services.reassign');
+      App.router.transitionTo('reassign');
     });
   },
 

+ 4 - 0
ambari-web/app/models/host_component.js

@@ -187,6 +187,7 @@ App.HostComponentStatus = {
   installing: "INSTALLING",
   upgrade_failed: "UPGRADE_FAILED",
   unknown: "UNKNOWN",
+  disabled: "DISABLED",
 
   /**
    * Get host component status in "machine" format
@@ -209,6 +210,7 @@ App.HostComponentStatus = {
         return 'installing';
       case this.upgrade_failed:
         return 'upgrade_failed';
+      case this.disabled:
       case this.unknown:
         return 'unknown';
     }
@@ -238,6 +240,8 @@ App.HostComponentStatus = {
         return 'Heartbeat lost...';
       case this.upgrade_failed:
         return 'Upgrade Failed';
+      case this.disabled:
+        return 'Disabled';
     }
     return 'Unknown';
   }

+ 1 - 1
ambari-web/app/views/main/host/details/host_component_view.js

@@ -172,7 +172,7 @@ App.HostComponentView = Em.View.extend({
    */
   noActionAvailable: function () {
     var workStatus = this.get('workStatus');
-    if ([App.HostComponentStatus.starting, App.HostComponentStatus.stopping, App.HostComponentStatus.unknown].contains(workStatus)) {
+    if ([App.HostComponentStatus.starting, App.HostComponentStatus.stopping, App.HostComponentStatus.unknown, App.HostComponentStatus.disabled].contains(workStatus)) {
       return "hidden";
     }else{
       return "";

+ 1 - 0
ambari-web/test/views/main/host/details/host_component_view_test.js

@@ -211,6 +211,7 @@ describe('App.HostComponentView', function() {
       {workStatus: 'STARTING', e: 'hidden'},
       {workStatus: 'STOPPING', e: 'hidden'},
       {workStatus: 'UNKNOWN', e: 'hidden'},
+      {workStatus: 'DISABLED', e: 'hidden'},
       {workStatus: 'OTHER_STATUS', e: ''}
     ]);