jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Fix backward compatibility and resolve conflict

Browse Source
This commit is contained in:
deecay
2017-04-03 16:25:23 +09:00
parent 081ac5f651
commit 9f3fd021ab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/app/visualizations/pivot/index.js
View File

@@ -1,3 +1,4 @@
import angular from 'angular';
import $ from 'jquery';
import 'pivottable';
import 'pivottable/dist/pivot.css';
@@ -24,7 +25,7 @@ function pivotTableRenderer() {
if ($scope.queryResult.getData() !== null) {
// We need to give the pivot table its own copy of the data, because it changes
// it which interferes with other visualizations.
data = $.extend(true, [], $scope.queryResult.getRawData());
data = angular.copy($scope.queryResult.getData());
const options = {
renderers: $.pivotUtilities.renderers,
onRefresh(config) {
@@ -47,7 +48,7 @@ function pivotTableRenderer() {
Object.assign(options, $scope.visualization.options);
}
$(element).pivotUI(data, options, true);
if ($scope.visualization.options.controls.enabled) {
if (options.controls && options.controls.enabled) {
const controls = $('.pvtAxisContainer, .pvtRenderer, .pvtVals');
for (let i = 0; i < controls.length; i += 1) { controls[i].style.display = 'none'; }
}