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

fix: table panel could not show annotations due to bug introduced in 4.2, fixes #8023

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-04-03 22:07:09 +02:00
parent 95e0010a5b
commit dd800fd14d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,9 @@
* **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky) * **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky)
* **Templating**: Data source variable now supports multi value and panel repeats [#7030](https://github.com/grafana/grafana/issues/7030) thx [@mtanda](https://github.com/mtanda) * **Templating**: Data source variable now supports multi value and panel repeats [#7030](https://github.com/grafana/grafana/issues/7030) thx [@mtanda](https://github.com/mtanda)
## Fixes
* **Table Panel**: Fixed annotation display in table panel, [#8023](https://github.com/grafana/grafana/issues/8023)
# 4.2.0 (2017-03-22) # 4.2.0 (2017-03-22)
## Minor Enhancements ## Minor Enhancements
* **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678) * **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)

8
public/app/plugins/panel/table/module.html
View File

@ -1,7 +1,7 @@
<div class="table-panel-container"> <div class="table-panel-container">
<div class="table-panel-header-bg" ng-show="ctrl.dataRaw.length>0"></div> <div class="table-panel-header-bg" ng-show="ctrl.table.rows.length"></div>
<div class="table-panel-scroll" ng-show="ctrl.dataRaw.length>0"> <div class="table-panel-scroll" ng-show="ctrl.table.rows.length">
<table class="table-panel-table"> <table class="table-panel-table">
<thead> <thead>
<tr> <tr>
@ -21,9 +21,9 @@
</table> </table>
</div> </div>
</div> </div>
<div class="datapoints-warning" ng-show="ctrl.dataRaw.length===0"> <div class="datapoints-warning" ng-show="ctrl.table.rows.length===0">
<span class="small" > <span class="small" >
No datapoints <tip>No datapoints returned from metric query</tip> No data to show <tip>Nothing returned by data query</tip>
</span> </span>
</div> </div>
<div class="table-panel-footer"> <div class="table-panel-footer">