From 7ea005036ffe6dc2e1b4e2f728a6d9bd0028c107 Mon Sep 17 00:00:00 2001
From: Nathan Haug <nate@quicksketch.org>
Date: Mon, 29 Jul 2013 12:13:28 -0700
Subject: [PATCH] Issue #2052429: Followup to "Make multiple series charts
easier to create through Views". The setting for "Inherit Y-Axis" was not
having an effect unless manually saved.
---
views/charts_plugin_style_chart.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/views/charts_plugin_style_chart.inc b/views/charts_plugin_style_chart.inc
index cf27d28..044bd91 100644
--- a/views/charts_plugin_style_chart.inc
+++ b/views/charts_plugin_style_chart.inc
@@ -63,7 +63,7 @@ class charts_plugin_style_chart extends views_plugin_style {
$form['fields']['label_field']['#disabled'] = TRUE;
$form['display']['#access'] = FALSE;
$form['xaxis']['#access'] = FALSE;
- if ($this->display->handler->options['inherit_yaxis']) {
+ if ($this->display->handler->get_option('inherit_yaxis')) {
$form['yaxis']['#access'] = FALSE;
}
else {
@@ -240,7 +240,7 @@ class charts_plugin_style_chart extends views_plugin_style {
// Copy the settings for our axes over to the child view.
foreach ($this->options as $option_name => $option_value) {
- if (strpos($option_name, 'yaxis') === 0 && $child_display->display_options['inherit_yaxis']) {
+ if (strpos($option_name, 'yaxis') === 0 && $child_display->handler->get_option('inherit_yaxis')) {
$subview->display_handler->options['style_options'][$option_name] = $option_value;
}
elseif (strpos($option_name, 'xaxis') === 0) {
@@ -256,7 +256,7 @@ class charts_plugin_style_chart extends views_plugin_style {
unset($subview);
// Create a secondary axis if needed.
- if (!$child_display->display_options['inherit_yaxis'] && isset($subchart['yaxis'])) {
+ if (!$child_display->handler->get_option('inherit_yaxis') && isset($subchart['yaxis'])) {
$chart['secondary_yaxis'] = $subchart['yaxis'];
$chart['secondary_yaxis']['#opposite'] = TRUE;
}
@@ -267,10 +267,10 @@ class charts_plugin_style_chart extends views_plugin_style {
$chart[$key] = $subchart[$key];
// If the subchart is a different type than the parent chart, set
// the #chart_type property on the individual chart data elements.
- if ($chart[$key]['#chart_type'] !== $chart['#chart_type']) {
+ if ($subchart['#chart_type'] !== $chart['#chart_type']) {
$chart[$key]['#chart_type'] = $subchart['#chart_type'];
}
- if (!$child_display->display_options['inherit_yaxis']) {
+ if (!$child_display->handler->get_option('inherit_yaxis')) {
$chart[$key]['#target_axis'] = 'secondary_yaxis';
}
}
--
GitLab