Bladeren bron

Annotations: mini fix for annotations editor and the list of annotations

Torkel Ödegaard 11 jaren geleden
bovenliggende
commit
f79588c191
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      CHANGELOG.md
  2. 1 1
      src/app/partials/annotations_editor.html

+ 1 - 1
CHANGELOG.md

@@ -1,7 +1,7 @@
 # 1.9.1 (unreleased)
 # 1.9.1 (unreleased)
 
 
 **Enhancements**
 **Enhancements**
-- [Issue #1028](https://github.com/grafana/grafana/issues/1028). Graph: New legend option ``hideEmtpy`` to hide series with only null values
+- [Issue #1028](https://github.com/grafana/grafana/issues/1028). Graph: New legend option ``hideEmtpy`` to hide series with only null values from legend
 
 
 **Fixes**
 **Fixes**
 - [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled
 - [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled

+ 1 - 1
src/app/partials/annotations_editor.html

@@ -16,7 +16,7 @@
 	<div class="dashboard-editor-body">
 	<div class="dashboard-editor-body">
 		<div class="editor-row row" ng-if="editor.index == 0">
 		<div class="editor-row row" ng-if="editor.index == 0">
 			<div class="span6">
 			<div class="span6">
-				<div ng-if="variables.length === 0">
+				<div ng-if="annotations.length === 0">
 					<em>No annotations defined</em>
 					<em>No annotations defined</em>
 				</div>
 				</div>
 				<table class="grafana-options-table">
 				<table class="grafana-options-table">