You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2016/02/25 14:08:49 UTC
ambari git commit: AMBARI-15181. JS error on UI load (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 87f8746f4 -> 66ba9f294
AMBARI-15181. JS error on UI load (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/66ba9f29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/66ba9f29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/66ba9f29
Branch: refs/heads/trunk
Commit: 66ba9f294f879d1636038b8873447207df130300
Parents: 87f8746
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Feb 25 15:04:55 2016 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Feb 25 15:04:55 2016 +0200
----------------------------------------------------------------------
.../app/mappers/alert_definition_summary_mapper.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/66ba9f29/ambari-web/app/mappers/alert_definition_summary_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/alert_definition_summary_mapper.js b/ambari-web/app/mappers/alert_definition_summary_mapper.js
index 72eeb01..8b59c7c 100644
--- a/ambari-web/app/mappers/alert_definition_summary_mapper.js
+++ b/ambari-web/app/mappers/alert_definition_summary_mapper.js
@@ -48,7 +48,7 @@ App.alertDefinitionSummaryMapper = App.QuickDataMapper.create({
});
summaryMap[alertDefinitionSummary.definition_id] = {
summary: summary,
- lastTriggered: App.dateTimeWithTimeZone(parseInt(timestamp)),
+ lastTriggered: App.dateTimeWithTimeZone(parseInt(timestamp, 10)),
lastTriggeredRaw: timestamp
};
}
@@ -56,7 +56,7 @@ App.alertDefinitionSummaryMapper = App.QuickDataMapper.create({
alertDefinitions.forEach(function (d) {
var id = d.get('id');
- if ((alertDefinitionsMap[id].get('stateManager.currentState.name') !== 'saved')) {
+ if (alertDefinitionsMap[id].get('stateManager.currentState.name') !== 'saved') {
alertDefinitionsMap[id].get('stateManager').transitionTo('saved');
}
alertDefinitionsMap[id].setProperties(summaryMap[id]);
@@ -92,11 +92,10 @@ App.alertDefinitionSummaryMapper = App.QuickDataMapper.create({
hasCriticalAlerts: hasCriticalAlerts
});
- var masters = service.get('hostComponents').filterProperty('isMaster');
- masters.forEach(function (master) {
- var hasCriticalAlerts = false;
+ service.get('hostComponents').filterProperty('isMaster').forEach(function (master) {
- var alertsCount = groupedByComponentName[master.get('componentName')].map(function (alertDefinition) {
+ hasCriticalAlerts = false;
+ alertsCount = (groupedByComponentName[master.get('componentName')] || []).map(function (alertDefinition) {
var criticalCount = alertDefinition.getWithDefault('summary.CRITICAL.count', 0);
var warningCount = alertDefinition.getWithDefault('summary.WARNING.count', 0);