Skip to content

Commit 3e0c4c5

Browse files
Merge branch 'development' of https://github.com/codeinwp/visualizer into issue-771
2 parents 5f919f1 + 70ec9f5 commit 3e0c4c5

File tree

6 files changed

+38
-12
lines changed

6 files changed

+38
-12
lines changed

classes/Visualizer/Gutenberg/Block.php

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -588,14 +588,19 @@ public function update_chart_data( $data ) {
588588
apply_filters( 'visualizer_pro_remove_schedule', $data['id'] );
589589
}
590590

591-
if ( $source_type === 'Visualizer_Source_Query' ) {
592-
$db_schedule = intval( $data['visualizer-db-schedule'] );
593-
$db_query = $data['visualizer-db-query'];
594-
update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE, $db_schedule );
595-
update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) );
596-
} else {
597-
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
598-
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
591+
// let's check if this is not an external db chart
592+
// as there is no support for that in the block editor interface
593+
$external_params = get_post_meta( $data['id'], Visualizer_Plugin::CF_REMOTE_DB_PARAMS, true );
594+
if ( empty( $external_params ) ) {
595+
if ( $source_type === 'Visualizer_Source_Query' ) {
596+
$db_schedule = intval( $data['visualizer-db-schedule'] );
597+
$db_query = $data['visualizer-db-query'];
598+
update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE, $db_schedule );
599+
update_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY, stripslashes( $db_query ) );
600+
} else {
601+
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_SCHEDULE );
602+
delete_post_meta( $data['id'], Visualizer_Plugin::CF_DB_QUERY );
603+
}
599604
}
600605

601606
if ( $source_type === 'Visualizer_Source_Json' ) {

classes/Visualizer/Gutenberg/build/block.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

classes/Visualizer/Gutenberg/src/Components/Sidebar/SlicesSettings.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ class SlicesSettings extends Component {
6868
settings.slices[i].offset = e;
6969
this.props.edit( settings );
7070
} }
71+
type="number"
72+
min="0"
73+
step="0.1"
7174
/>
7275

7376
<BaseControl

classes/Visualizer/Module/Setup.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,29 @@ public function refresh_db_for_chart( $chart, $chart_id, $force = false ) {
306306
update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
307307
}
308308

309+
$allow_html = false;
310+
$settings = get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true );
311+
if ( isset( $settings['allowHtml'] ) && intval( $settings['allowHtml'] ) === 1 ) {
312+
$allow_html = true;
313+
}
314+
315+
$allow_html = apply_filters( 'visualizer_allow_html_content', $allow_html, $chart_id, $chart );
316+
317+
if ( $allow_html ) {
318+
kses_remove_filters();
319+
}
320+
309321
wp_update_post(
310322
array(
311323
'ID' => $chart_id,
312324
'post_content' => $source->getData( get_post_meta( $chart_id, Visualizer_Plugin::CF_EDITABLE_TABLE, true ) ),
313325
)
314326
);
315327

328+
if ( $allow_html ) {
329+
kses_init_filters();
330+
}
331+
316332
$chart = get_post( $chart_id );
317333
delete_post_meta( $chart_id, Visualizer_Plugin::CF_ERROR );
318334
} else {

classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Pie.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ protected function _renderSlicesSettings() {
186186
self::_renderTextItem(
187187
esc_html__( 'Slice Offset', 'visualizer' ),
188188
'slices[' . $i . '][offset]',
189-
isset( $this->slices[ $i ]['offset'] ) ? $this->slices[ $i ]['offset'] : null,
189+
isset( $this->slices[ $i ]['offset'] ) && ! empty( $this->slices[ $i ]['offset'] ) ? $this->slices[ $i ]['offset'] : 0,
190190
esc_html__( "How far to separate the slice from the rest of the pie, from 0.0 (not at all) to 1.0 (the pie's radius).", 'visualizer' ),
191-
'0.0'
191+
'0.0',
192+
'number',
193+
array( 'step' => 0.1, 'min' => 0 )
192194
);
193195

194196
self::_renderColorPickerItem(

classes/Visualizer/Source/Csv/Remote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Visualizer_Source_Csv_Remote extends Visualizer_Source_Csv {
4747
* @access public
4848
* @return string The serialized array of data.
4949
*/
50-
public function getData() {
50+
public function getData( $dumb = false ) {
5151
return serialize(
5252
array(
5353
'source' => $this->_filename,

0 commit comments

Comments
 (0)