From bd1e43b072c1ea6ea60403999e041b0ea4c2d2cd Mon Sep 17 00:00:00 2001
From: andileco <daniel@andile.co>
Date: Tue, 9 May 2017 22:10:08 -0400
Subject: [PATCH] Fix broken fields in the Chart Attachment display and code
formatting edits.
---
charts.install | 3 +--
charts.permissions.yml | 1 -
.../charts_api_example/src/Controller/ChartsApiExample.php | 6 +++---
src/Charts/ModuleSelector.php | 1 -
src/Form/ChartsConfigForm.php | 2 +-
src/Plugin/views/display/ChartsPluginDisplayChart.php | 7 ++-----
6 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/charts.install b/charts.install
index 36fab2b..ed6529d 100644
--- a/charts.install
+++ b/charts.install
@@ -8,8 +8,7 @@
* Implements hook_requirements().
*/
function charts_requirements($phase) {
- $requirements = array();
+ $requirements = [];
return $requirements;
}
-
diff --git a/charts.permissions.yml b/charts.permissions.yml
index 1997d7e..cc35295 100644
--- a/charts.permissions.yml
+++ b/charts.permissions.yml
@@ -3,4 +3,3 @@ access all charts:
title: 'Administer Charts'
description: 'This permission needs to be fleshed out.'
restrict access: TRUE
-
diff --git a/modules/charts_api_example/src/Controller/ChartsApiExample.php b/modules/charts_api_example/src/Controller/ChartsApiExample.php
index bae392a..b3e896d 100644
--- a/modules/charts_api_example/src/Controller/ChartsApiExample.php
+++ b/modules/charts_api_example/src/Controller/ChartsApiExample.php
@@ -20,11 +20,11 @@ class ChartsApiExample extends ControllerBase implements ContainerInjectionInter
$library = $this->chartSettings['library'];
$options = [];
$options['type'] = $this->chartSettings['type'];
- $options['title'] = t('Chart title');
- $options['yaxis_title'] = t('Y-Axis');
+ $options['title'] = $this->t('Chart title');
+ $options['yaxis_title'] = $this->t('Y-Axis');
$options['yaxis_min'] = '';
$options['yaxis_max'] = '';
- $options['xaxis_title'] = t('X-Axis');
+ $options['xaxis_title'] = $this->t('X-Axis');
//sample data format
$categories = ["Category 1", "Category 2", "Category 3", "Category 4"];
$seriesData = [
diff --git a/src/Charts/ModuleSelector.php b/src/Charts/ModuleSelector.php
index f97e400..ee99af5 100644
--- a/src/Charts/ModuleSelector.php
+++ b/src/Charts/ModuleSelector.php
@@ -32,7 +32,6 @@ class ModuleSelector {
private function moduleExists($moduleName, &$variables) {
$moduleExist = \Drupal::moduleHandler()->moduleExists($moduleName);
if ('charts_' . $moduleExist) {
- $className = ucfirst($moduleName);
$moduleChartsRenderer = 'Drupal\charts_' . $moduleName . '\Charts\\' . ucfirst($moduleName) . 'ChartsRender';
$chartingModule = new $moduleChartsRenderer();
$chartingModule->charts_render_charts($this->options, $this->categories, $this->seriesData, $this->attachmentDisplayOptions, $variables, $this->chartId);
diff --git a/src/Form/ChartsConfigForm.php b/src/Form/ChartsConfigForm.php
index 33bf6d0..3a9c0a9 100644
--- a/src/Form/ChartsConfigForm.php
+++ b/src/Form/ChartsConfigForm.php
@@ -142,7 +142,7 @@ class ChartsConfigForm extends ConfigFormBase {
}
}
if (count($library_options) == 0) {
- drupal_set_message(t('There are no enabled charting libraries. Please enable a Charts sub-module.'));
+ drupal_set_message($this->t('There are no enabled charting libraries. Please enable a Charts sub-module.'));
}
$form['library'] = [
'#title' => $this->t('Charting library'),
diff --git a/src/Plugin/views/display/ChartsPluginDisplayChart.php b/src/Plugin/views/display/ChartsPluginDisplayChart.php
index adbfde8..1eb65b3 100644
--- a/src/Plugin/views/display/ChartsPluginDisplayChart.php
+++ b/src/Plugin/views/display/ChartsPluginDisplayChart.php
@@ -80,11 +80,8 @@ class ChartsPluginDisplayChart extends Attachment {
'value' => $this->getOption('inherit_yaxis') ? t('Use primary Y-axis') : t('Create secondary axis'),
];
- $options['attachment_position'] = ['disabled' => TRUE];
-
- $options['inherit_pager'] = ['disabled' => TRUE];
-
- $options['render_pager'] = ['disabled' => TRUE];
+ unset($options['attachment_position']);
+ unset($options['inherit_pager']);
}
--
GitLab