IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 16:57:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(templating): fix for text panel when using template variables in text and repeating panel, fixes #2442

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-08-05 14:23:09 +02:00
parent 91e5fcf8f1
commit bd7ae3dc71
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
**Fixes** **Fixes**
- [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release - [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
- [Issue #2442](https://github.com/grafana/grafana/issues/2442). Templating: Fix text panel when using template variables in text in in repeated panel
# 2.1.0 (2015-08-04) # 2.1.0 (2015-08-04)

2
public/app/panels/text/module.js
View File

@ -93,7 +93,7 @@ function (angular, app, _, require, PanelMeta) {
$scope.updateContent = function(html) { $scope.updateContent = function(html) {
try { try {
$scope.content = $sce.trustAsHtml(templateSrv.replace(html)); $scope.content = $sce.trustAsHtml(templateSrv.replace(html, $scope.panel.scopedVars));
} catch(e) { } catch(e) {
console.log('Text panel error: ', e); console.log('Text panel error: ', e);
$scope.content = $sce.trustAsHtml(html); $scope.content = $sce.trustAsHtml(html);