[ambari] branch trunk updated: AMBARI-23927 Disabled alert status isn't "NONE"

[at...@apache.org]

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

atkach 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 7b89c5a  AMBARI-23927 Disabled alert status isn't "NONE"
7b89c5a is described below

commit 7b89c5a69f8a0c0cf53085058957f5e69debafd9
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Tue May 22 16:02:46 2018 +0300

    AMBARI-23927 Disabled alert status isn't "NONE"
---
 .../templates/main/alerts/alert_definition/alert_definition_summary.hbs | 2 +-
 .../app/views/main/alerts/alert_definition/alert_definition_summary.js  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs b/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs
index 5947711..981033a 100644
--- a/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs
+++ b/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-{{#if view.hasMultipleCount}}
+{{#if view.isActiveDefinitionState}}
   {{#each st in view.definitionState}}
     {{#if st.count}}
       <span {{bindAttr class=":alert-state-single-host :label st.state"}}>{{st.count}}</span>
diff --git a/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js b/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js
index 524d451..575501e 100644
--- a/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js
+++ b/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js
@@ -29,6 +29,8 @@ App.AlertDefinitionSummary = Em.View.extend({
 
   hasMultipleCount: Em.computed.gt('content.hostCnt', 0),
 
+  isActiveDefinitionState: Em.computed.and('hasMultipleCount', 'content.enabled'),
+
   definitionState: function () {
     var content = this.get('content');
     if (!content) {

-- 
To stop receiving notification emails like this one, please contact
atkach@apache.org.