[ambari] branch trunk updated: AMBARI-24621. Badge with count of empty or invalid properties are missed ar the services panel during cluster installation (akovalenko)

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ffeaf06  AMBARI-24621. Badge with count of empty or invalid properties are missed ar the services panel during cluster installation (akovalenko)
ffeaf06 is described below

commit ffeaf06c625046a554ca7e0f422dae3a9c109100
Author: Aleksandr Kovalenko <ak...@apache.org>
AuthorDate: Tue Sep 11 19:54:23 2018 +0300

    AMBARI-24621. Badge with count of empty or invalid properties are missed ar the services panel during cluster installation (akovalenko)
---
 ambari-web/app/controllers/installer.js                     | 2 +-
 ambari-web/app/templates/common/configs/services_config.hbs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 06da057..82aa615 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -738,7 +738,7 @@ App.InstallerController = App.WizardController.extend(App.Persist, {
       existedOS.isSelected = true;
       existedMap[existedOS.OperatingSystems.os_type] = existedOS;
     });
-    if (response.Versions['stack-errors'] && response.Versions['stack-errors'].length) {
+    if (response.Versions && response.Versions['stack-errors'] && response.Versions['stack-errors'].length) {
       this.showStackErrorAndSkipStepIfNeeded(response);
       return;
     }
diff --git a/ambari-web/app/templates/common/configs/services_config.hbs b/ambari-web/app/templates/common/configs/services_config.hbs
index 23718bc..916701f 100644
--- a/ambari-web/app/templates/common/configs/services_config.hbs
+++ b/ambari-web/app/templates/common/configs/services_config.hbs
@@ -28,10 +28,10 @@
             <a href="#" {{action selectService tab target="controller"}} {{bindAttr data-target="tab.headingClass"}}
                data-toggle="tab">
               {{formatRole tab.serviceName}}
-              {{#if tab.errorsCount}}
+              {{#if tab.configsWithErrors}}
                 <span class="alert-badge">
                   <span class="counter label alerts-crit-count">
-                    {{tab.errorsCount}}
+                    {{tab.configsWithErrors.length}}
                   </span>
                 </span>
               {{/if}}