Merge pull request #610 from lucasponce/HAWKULAR-748

HAWKULAR-748 Error on empty notes
hawkular · Oct 26, 2015 · 3cb32bf · 3cb32bf
2 parents 0cd2c48 + 20c9e5c
commit 3cb32bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsCenterDetails.ts b/console/src/main/scripts/plugins/metrics/ts/alertsCenterDetails.ts
@@ -145,6 +145,10 @@ module HawkularMetrics {
         resolvedNotes: this.comments
       };
 
+      if (!resolvedAlerts.resolvedNotes || resolvedAlerts.resolvedNotes.length === 0) {
+        resolvedAlerts.resolvedNotes = 'Manually resolved';
+      }
+
       this.HawkularAlertsManager.resolveAlerts(resolvedAlerts).then(() => {
         this.isWorking = false;
         this.getAlert(this._alertId);
@@ -162,6 +166,10 @@ module HawkularMetrics {
         ackNotes: this.comments
       };
 
+      if (!ackAlerts.ackNotes || ackAlerts.ackNotes.length === 0) {
+        ackAlerts.ackNotes = 'Manually acknowledged ';
+      }
+
       this.HawkularAlertsManager.ackAlerts(ackAlerts).then(() => {
         this.isWorking = false;
         this.getAlert(this._alertId);

diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsCenterList.ts b/console/src/main/scripts/plugins/metrics/ts/alertsCenterList.ts
@@ -147,7 +147,7 @@ module HawkularMetrics {
         let resolvedAlerts = {
           alertIds: resolveIdList,
           resolvedBy: this.$rootScope.currentPersona.name,
-          resolvedNotes: 'Manually resolved '
+          resolvedNotes: 'Manually resolved'
         };
 
         this.HawkularAlertsManager.resolveAlerts(resolvedAlerts).then(() => {
@@ -174,7 +174,7 @@ module HawkularMetrics {
         let ackAlerts = {
           alertIds: ackIdList,
           ackBy: this.$rootScope.currentPersona.name,
-          ackNotes: 'Manually acknowledged '
+          ackNotes: 'Manually acknowledged'
         };
 
         this.HawkularAlertsManager.ackAlerts(ackAlerts).then(() => {