From 7f8653dffceec04a402014e60b59def1729c3c8d Mon Sep 17 00:00:00 2001 From: Franck Deroche Date: Mon, 7 Nov 2011 17:53:35 +0100 Subject: [PATCH 1/2] bug #684608: Convert new taxonomy settings name The settings got renamed in the 6.x-2.x branch according to the convention used there, but this means that they now longer match the one used in the 3.x branch. This patch adds a convert_options method to views_plugin_argument_default_taxonomy_tid to map the 6.x-2.x names to the one in the branch --- .../views_plugin_argument_default_taxonomy_tid.inc | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc index ee88fb2..7ea55f2 100644 --- a/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc +++ b/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc @@ -16,6 +16,22 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d return $options; } + function convert_options(&$options) { + if (!isset($options['term_page']) && isset($this->argument->options['default_taxonomy_tid_term_page'])) { + $options['term_page'] = $this->argument->options['default_taxonomy_tid_term_page']; + } + if (!isset($options['node']) && isset($this->argument->options['default_taxonomy_tid_node'])) { + $options['node'] = $this->argument->options['default_taxonomy_tid_node']; + } + if (!isset($options['limit']) && isset($this->argument->options['default_taxonomy_tid_limit'])) { + $options['limit'] = $this->argument->options['default_taxonomy_tid_limit']; + } + if (!isset($options['vids']) && isset($this->argument->options['default_taxonomy_tid_vids'])) { + $options['vids'] = $this->argument->options['default_taxonomy_tid_vids']; + } + } + + function options_form(&$form, &$form_state) { $form['term_page'] = array( '#type' => 'checkbox', -- 1.7.7.2