ambari git commit: AMBARI-17551 AssignSlaves page doesnt let choose NodeManager evethough it complaints to add atleast one. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk 81354ffd2 -> 407eb5435


AMBARI-17551 AssignSlaves page doesnt let choose NodeManager evethough it 
complaints to add atleast one. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/407eb543
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/407eb543
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/407eb543

Branch: refs/heads/trunk
Commit: 407eb543577f460f319822504d8cc9558ae5aabc
Parents: 81354ff
Author: Andrii Tkach <atk...@apache.org>
Authored: Wed Sep 27 13:21:17 2017 +0300
Committer: Andrii Tkach <atk...@apache.org>
Committed: Wed Sep 27 16:47:23 2017 +0300

----------------------------------------------------------------------
 .../app/controllers/wizard/step6_controller.js       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/407eb543/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js 
b/ambari-web/app/controllers/wizard/step6_controller.js
index fb26dc2..68ec3ed 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -708,8 +708,6 @@ App.WizardStep6Controller = 
Em.Controller.extend(App.HostComponentValidationMixi
    * @override App.HostComponentRecommendationMixin
    */
   updateValidationsSuccessCallback: function (data) {
-    var self = this;
-
     var clientComponents = App.get('components.clients');
 
     this.set('generalErrorMessages', []);
@@ -729,7 +727,7 @@ App.WizardStep6Controller = 
Em.Controller.extend(App.HostComponentValidationMixi
     }).forEach(function (item) {
       var checkboxWithIssue = null;
       var isGeneralClientValidationItem = 
clientComponents.contains(item['component-name']); // it is an error/warning 
for any client component (under "CLIENT" alias)
-      var host = self.get('hosts').find(function (h) {
+      var host = this.get('hosts').find(function (h) {
         return h.hostName === item.host && h.checkboxes.some(function 
(checkbox) {
           var isClientComponent = checkbox.component === "CLIENT" && 
isGeneralClientValidationItem;
           if (checkbox.component === item['component-name'] || 
isClientComponent) {
@@ -753,6 +751,11 @@ App.WizardStep6Controller = 
Em.Controller.extend(App.HostComponentValidationMixi
           }
       }
       else {
+        var componentHeader = this.get('headers').findProperty('name', 
item['component-name']);
+        if (componentHeader && componentHeader.get('isDisabled')) {
+          // skip validation messages for components which disabled for editing
+          return;
+        }
         var component;
         if (isGeneralClientValidationItem) {
           if (!anyGeneralClientErrors) {
@@ -771,15 +774,15 @@ App.WizardStep6Controller = 
Em.Controller.extend(App.HostComponentValidationMixi
           }
 
           if (item.level === 'ERROR') {
-            self.get('generalErrorMessages').push(item.message + details);
+            this.get('generalErrorMessages').push(item.message + details);
           }
           else
             if (item.level === 'WARN') {
-              self.get('generalWarningMessages').push(item.message + details);
+              this.get('generalWarningMessages').push(item.message + details);
             }
         }
       }
-    });
+    }, this);
   },
 
   /**