IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Annotations: Check that timeEnd if defined before comparing to avoid false truthiness (#18903)

Browse Source 
* Check that timeEnd if defined before comparing to avoid false truthiness

* Moved loop

Fixes #18902
This commit is contained in:
Shavonn Brown
2019-09-05 02:14:06 -04:00
committed by Torkel Ödegaard
parent 3f0862a7d1
commit 849d4881cd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/annotations/annotations_srv.ts
View File

@@ -60,10 +60,6 @@ export class AnnotationsSrv {
});
annotations = dedupAnnotations(annotations);
for (let i = 0; i < annotations.length; i++) {
const a = annotations[i];
a.isRegion = a.time !== a.timeEnd;
}
// look for alert state for this panel
const alertState: any = _.find(results[1], { panelId: options.panel.id });
@@ -181,7 +177,9 @@ export class AnnotationsSrv {
for (const item of results) {
item.source = annotation;
item.isRegion = item.timeEnd && item.time !== item.timeEnd;
}
return results;
}
}