From ae2f1d0c05d66bfe3bbb6730761f6908106b49e5 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Fri, 25 Mar 2016 11:54:04 -0700
Subject: [PATCH] Fix caching issue with Angular partial. Just inline it.
Resolves #2210
---
frontend/src/card/card.module.js | 15 ++++++++++++---
.../app/card/partials/card_detail.html | 8 --------
2 files changed, 12 insertions(+), 11 deletions(-)
delete mode 100644 resources/frontend_client/app/card/partials/card_detail.html
diff --git a/frontend/src/card/card.module.js b/frontend/src/card/card.module.js
index f012aeac8ca..63043d1a1c1 100644
--- a/frontend/src/card/card.module.js
+++ b/frontend/src/card/card.module.js
@@ -1,4 +1,13 @@
-// Card
+const CARD_DETAIL_TEMPLATE =
+`<div class="QueryBuilder flex flex-column bg-white spread" ng-class="{ 'QueryBuilder--showDataReference': isShowingDataReference }">
+ <div id="react_qb_header"></div>
+ <div id="react_qb_editor" class="z2"></div>
+ <div id="react_qb_viz" class="flex z1"></div>
+</div>
+<div class="DataReference" id="react_data_reference"></div>
+<div id="react_qb_tutorial"></div>
+<div id="react_qbnewb_modal"></div>`;
+
var Card = angular.module('metabase.card', [
'ngRoute',
'ngCookies',
@@ -10,11 +19,11 @@ var Card = angular.module('metabase.card', [
Card.config(['$routeProvider', function($routeProvider) {
$routeProvider.when('/q', {
- templateUrl: '/app/card/partials/card_detail.html',
+ template: CARD_DETAIL_TEMPLATE,
controller: 'CardDetail'
});
$routeProvider.when('/card/:cardId', {
- templateUrl: '/app/card/partials/card_detail.html',
+ template: CARD_DETAIL_TEMPLATE,
controller: 'CardDetail'
});
diff --git a/resources/frontend_client/app/card/partials/card_detail.html b/resources/frontend_client/app/card/partials/card_detail.html
deleted file mode 100644
index a1339ea9c51..00000000000
--- a/resources/frontend_client/app/card/partials/card_detail.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="QueryBuilder flex flex-column bg-white spread" ng-class="{ 'QueryBuilder--showDataReference': isShowingDataReference }">
- <div id="react_qb_header"></div>
- <div id="react_qb_editor" class="z2"></div>
- <div id="react_qb_viz" class="flex z1"></div>
-</div>
-<div class="DataReference" id="react_data_reference"></div>
-<div id="react_qb_tutorial"></div>
-<div id="react_qbnewb_modal"></div>
--
GitLab