Skip to content

Commit ca00868

Browse files
integration testing
1 parent b5d458b commit ca00868

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

classes/Visualizer/Render/Layout.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public static function _renderDbQuery( $args ) {
7171
<form id='db-query-form'>
7272
<textarea name='query' class='visualizer-db-query' placeholder="<?php _e( 'Your query goes here', 'visualizer' ); ?>"><?php echo $query; ?></textarea>
7373
</form>
74+
<div class='db-wizard-error'></div>
7475
</div>
7576
<div>
7677
<input type="button" class="button button-primary" id='visualizer-query-fetch' value='<?php _e( 'Show Results', 'visualizer' ); ?>'>
@@ -82,7 +83,6 @@ public static function _renderDbQuery( $args ) {
8283
<li><?php echo sprintf( __( 'Use %1$sControl+Space%2$s for autocompleting keywords or tables/columns.', 'visualizer' ), '<span class="visualizer-emboss">', '</span>' ); ?></li>
8384
</ul>
8485
</div>
85-
<div class='db-wizard-error'></div>
8686
<div class='db-wizard-results'></div>
8787

8888
</div>

js/frame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
init_permissions();
2121

22-
if(visualizer.is_pro) {
22+
if(typeof visualizer !== 'undefined' && visualizer.is_pro) {
2323
init_db_import();
2424
}
2525

js/render-datatables.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
return;
2424
}
2525

26-
if($('#' + id).find('table.dataTable').length === 0){
27-
$('#' + id).append($('<table class="dataTable table table-striped"></table>'));
26+
if($('#' + id).find('table.visualizer-data-table').length > 0){
27+
$('#' + id).empty();
2828
}
29+
$('#' + id).append($('<table class="dataTable visualizer-data-table table table-striped"></table>'));
2930

3031
settings = {
3132
destroy: true,
@@ -121,7 +122,7 @@
121122
break;
122123
}
123124

124-
render = addRenderer(series[j].type, settings.series[j]);
125+
render = addRenderer(series[j].type, settings.series, j);
125126

126127
var col = { title: series[j].label, data: series[j].label, type: type, render: render };
127128
if(typeof chart.settings['cssClassNames'] !== 'undefined' && typeof chart.settings['cssClassNames']['tableCell'] !== 'undefined'){
@@ -143,7 +144,7 @@
143144
// allow user to extend the settings.
144145
$('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings});
145146

146-
table = $('#' + id + ' table.dataTable');
147+
table = $('#' + id + ' table.visualizer-data-table');
147148
table.DataTable( {
148149
data: rows,
149150
columns: cols,
@@ -152,12 +153,14 @@
152153
$('.loader').remove();
153154
}
154155

155-
function addRenderer(type, series){
156+
function addRenderer(type, series, index){
156157
var render = null;
157-
if(typeof series === 'undefined' || typeof series.format === 'undefined'){
158+
if(typeof series === 'undefined' || typeof series[index] === 'undefined' || typeof series[index].format === 'undefined' ){
158159
return render;
159160
}
160161

162+
series = series[index];
163+
161164
/* jshint ignore:start */
162165
switch(type){
163166
case 'number':

0 commit comments

Comments
 (0)