From bd7ae3dc71477cbf62c14770f0a4b2eb1160d2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 5 Aug 2015 14:23:09 +0200 Subject: [PATCH] fix(templating): fix for text panel when using template variables in text and repeating panel, fixes #2442 --- CHANGELOG.md | 1 + public/app/panels/text/module.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed5be3e20a7..5989ad51079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ **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 #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) diff --git a/public/app/panels/text/module.js b/public/app/panels/text/module.js index 436a9982b41..7dc98bcf136 100644 --- a/public/app/panels/text/module.js +++ b/public/app/panels/text/module.js @@ -93,7 +93,7 @@ function (angular, app, _, require, PanelMeta) { $scope.updateContent = function(html) { try { - $scope.content = $sce.trustAsHtml(templateSrv.replace(html)); + $scope.content = $sce.trustAsHtml(templateSrv.replace(html, $scope.panel.scopedVars)); } catch(e) { console.log('Text panel error: ', e); $scope.content = $sce.trustAsHtml(html);