From beb0169bc2688e813a7e0dfb09452d4223bae37d Mon Sep 17 00:00:00 2001
From: andileco <daniel@andile.co>
Date: Fri, 26 May 2017 15:34:34 -0400
Subject: [PATCH] Apply patch 2881452 and add donut as option on default
settings page.
---
src/Form/ChartsConfigForm.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/Form/ChartsConfigForm.php b/src/Form/ChartsConfigForm.php
index 3a9c0a9..9e37207 100644
--- a/src/Form/ChartsConfigForm.php
+++ b/src/Form/ChartsConfigForm.php
@@ -131,8 +131,6 @@ class ChartsConfigForm extends ConfigFormBase {
// Ensure all defaults are set.
$options = array_merge($this->charts_default_settings(), $defaults);
- $form['#attached']['library'][] = ['charts', 'charts.admin'];
-
// Get a list of available chart libraries.
$charts_info = $this->charts_info();
$library_options = [];
@@ -181,7 +179,7 @@ class ChartsConfigForm extends ConfigFormBase {
// Set data attributes to identify special properties of different types.
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;
}
if ($chart_type_info['axis'] === ChartsInterface::CHARTS_SINGLE_AXIS) {
@@ -485,6 +483,10 @@ class ChartsConfigForm extends ConfigFormBase {
'axis' => ChartsInterface::CHARTS_DUAL_AXIS,
'stacking' => TRUE,
];
+ $chart_types['donut'] = [
+ 'label' => $this->t('Donut'),
+ 'axis' => ChartsInterface::CHARTS_SINGLE_AXIS,
+ ];
$chart_types['line'] = [
'label' => $this->t('Line'),
'axis' => ChartsInterface::CHARTS_DUAL_AXIS,
--
GitLab