Skip to content
Snippets Groups Projects
Commit beb0169b authored by andileco's avatar andileco
Browse files

Apply patch 2881452 and add donut as option on default settings page.

parent 639a6a74
No related branches found
No related tags found
No related merge requests found
...@@ -131,8 +131,6 @@ class ChartsConfigForm extends ConfigFormBase { ...@@ -131,8 +131,6 @@ class ChartsConfigForm extends ConfigFormBase {
// Ensure all defaults are set. // Ensure all defaults are set.
$options = array_merge($this->charts_default_settings(), $defaults); $options = array_merge($this->charts_default_settings(), $defaults);
$form['#attached']['library'][] = ['charts', 'charts.admin'];
// Get a list of available chart libraries. // Get a list of available chart libraries.
$charts_info = $this->charts_info(); $charts_info = $this->charts_info();
$library_options = []; $library_options = [];
...@@ -181,7 +179,7 @@ class ChartsConfigForm extends ConfigFormBase { ...@@ -181,7 +179,7 @@ class ChartsConfigForm extends ConfigFormBase {
// Set data attributes to identify special properties of different types. // Set data attributes to identify special properties of different types.
foreach ($chart_types as $chart_type => $chart_type_info) { foreach ($chart_types as $chart_type => $chart_type_info) {
if ($chart_type_info['axis_inverted']) { if (isset($chart_type_info['axis_inverted']) && $chart_type_info['axis_inverted']) {
$form['type'][$chart_type]['#attributes']['data-axis-inverted'] = TRUE; $form['type'][$chart_type]['#attributes']['data-axis-inverted'] = TRUE;
} }
if ($chart_type_info['axis'] === ChartsInterface::CHARTS_SINGLE_AXIS) { if ($chart_type_info['axis'] === ChartsInterface::CHARTS_SINGLE_AXIS) {
...@@ -485,6 +483,10 @@ class ChartsConfigForm extends ConfigFormBase { ...@@ -485,6 +483,10 @@ class ChartsConfigForm extends ConfigFormBase {
'axis' => ChartsInterface::CHARTS_DUAL_AXIS, 'axis' => ChartsInterface::CHARTS_DUAL_AXIS,
'stacking' => TRUE, 'stacking' => TRUE,
]; ];
$chart_types['donut'] = [
'label' => $this->t('Donut'),
'axis' => ChartsInterface::CHARTS_SINGLE_AXIS,
];
$chart_types['line'] = [ $chart_types['line'] = [
'label' => $this->t('Line'), 'label' => $this->t('Line'),
'axis' => ChartsInterface::CHARTS_DUAL_AXIS, 'axis' => ChartsInterface::CHARTS_DUAL_AXIS,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment