summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy
diff options
context:
space:
mode:
authorTorsten Grote <grote@kolabsys.com>2012-08-27 12:47:35 (GMT)
committerTorsten Grote <grote@kolabsys.com>2012-08-27 12:47:35 (GMT)
commit7b5e4a2b04e4fb38485bc12965e07794388d0224 (patch)
tree42031777dcb7476a63e9d6080ab9b8eef8ebb6f0 /kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy
parentee39408867ae52c2321036a67c472e684c1e1108 (diff)
downloadkolab.org-www-7b5e4a2b04e4fb38485bc12965e07794388d0224.tar.gz
updated ctools, ldap and views modules
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc11
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc15
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc5
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc8
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc12
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc3
16 files changed, 98 insertions, 21 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
index 5c32ea4..10fc500 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_taxonomy.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_taxonomy.
+ */
+
+/**
* Argument handler for basic taxonomy tid.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
index e36c778..f47f08a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid.
+ */
+
/**
* Allow taxonomy term ID(s) as argument.
*
@@ -7,7 +13,7 @@
class views_handler_argument_term_node_tid extends views_handler_argument_many_to_one {
function option_definition() {
$options = parent::option_definition();
- $options['set_breadcrumb'] = array('default' => FALSE);
+ $options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
index 03b1409..116a4de 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid_depth.
+ */
+
/**
* Argument handler for taxonomy terms with depth.
*
@@ -12,9 +18,9 @@ class views_handler_argument_term_node_tid_depth extends views_handler_argument
$options = parent::option_definition();
$options['depth'] = array('default' => 0);
- $options['break_phrase'] = array('default' => FALSE);
- $options['set_breadcrumb'] = array('default' => FALSE);
- $options['use_taxonomy_term_path'] = array('default' => FALSE);
+ $options['break_phrase'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['set_breadcrumb'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['use_taxonomy_term_path'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
index da71796..2f9dd4e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_term_node_tid_depth_modif.
+ */
+
+/**
* Argument handler for to modify depth for a previous term.
*
* This handler is actually part of the node table and has some restrictions,
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
index b91b08f..427cf2b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_vocabulary_machine_name.
+ */
+
+/**
* Argument handler to accept a vocabulary machine name.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
index d79859b..c696640 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_argument_vocabulary_vid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_argument_vocabulary_vid.
+ */
+
+/**
* Argument handler to accept a vocabulary id.
*
* @ingroup views_argument_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
index c1ccb6d..48da283 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_taxonomy.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_taxonomy.
+ */
+
+/**
* Field handler to provide simple renderer that allows linking to a taxonomy
* term.
*
@@ -25,8 +30,8 @@ class views_handler_field_taxonomy extends views_handler_field {
function option_definition() {
$options = parent::option_definition();
- $options['link_to_taxonomy'] = array('default' => FALSE);
- $options['convert_spaces'] = array('default' => FALSE);
+ $options['link_to_taxonomy'] = array('default' => FALSE, 'bool' => TRUE);
+ $options['convert_spaces'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
index ae1f0a5..75ab0f8 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_term_link_edit.
+ */
+
+/**
* Field handler to present a term edit link.
*
* @ingroup views_field_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
index 4a6c7a4..4c6362e 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_field_term_node_tid.
+ */
+
+/**
* Field handler to display all taxonomy terms of a node.
*
* @ingroup views_field_handlers
@@ -30,8 +35,8 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
function option_definition() {
$options = parent::option_definition();
- $options['link_to_taxonomy'] = array('default' => TRUE);
- $options['limit'] = array('default' => FALSE);
+ $options['link_to_taxonomy'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['limit'] = array('default' => FALSE, 'bool' => TRUE);
$options['vocabularies'] = array('default' => array());
return $options;
@@ -51,7 +56,6 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
'#type' => 'checkbox',
'#title' => t('Limit terms by vocabulary'),
'#default_value'=> $this->options['limit'],
- '#fieldset' => 'more',
);
$options = array();
@@ -68,7 +72,6 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
'#options' => $options,
'#default_value' => $this->options['vocabularies'],
'#dependency' => array('edit-options-limit' => array(TRUE)),
- '#fieldset' => 'more',
);
parent::options_form($form, $form_state);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 25f9a7b..7eb868f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_term_node_tid.
+ */
+
+/**
* Filter by term id.
*
* @ingroup views_filter_handlers
@@ -33,10 +38,10 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$options = parent::option_definition();
$options['type'] = array('default' => 'textfield');
- $options['limit'] = array('default' => TRUE);
+ $options['limit'] = array('default' => TRUE, 'bool' => TRUE);
$options['vocabulary'] = array('default' => 0);
$options['hierarchy'] = array('default' => 0);
- $options['error_message'] = array('default' => TRUE);
+ $options['error_message'] = array('default' => TRUE, 'bool' => TRUE);
return $options;
}
@@ -168,6 +173,11 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$keys = array_keys($options);
$default_value = array_shift($keys);
}
+ // Due to #1464174 there is a chance that array('') was saved in the admin ui.
+ // Let's choose a safe default value.
+ elseif ($default_value == array('')) {
+ $default_value = 'All';
+ }
else {
$copy = $default_value;
$default_value = array_shift($copy);
@@ -336,6 +346,7 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
$this->value_options = array();
if ($this->value) {
+ $this->value = array_filter($this->value);
$result = db_select('taxonomy_term_data', 'td')
->fields('td')
->condition('td.tid', $this->value)
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
index 3955269..fe12780 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
@@ -1,4 +1,10 @@
<?php
+
+/**
+ * @file
+ * Definition of views_handler_filter_term_node_tid_depth.
+ */
+
/**
* Filter handler for taxonomy terms with depth.
*
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
index 5d2c9f5..062450c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_vocabulary_machine_name.
+ */
+
+/**
* Filter by vocabulary machine name.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
index a02f7b2..2759ee1 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_filter_vocabulary_vid.inc
@@ -1,6 +1,11 @@
<?php
/**
+ * @file
+ * Definition of views_handler_filter_vocabulary_vid.
+ */
+
+/**
* Filter by vocabulary id.
*
* @ingroup views_filter_handlers
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
index 1855cae..d7fbb4c 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_handler_relationship_node_term_data.inc
@@ -1,10 +1,10 @@
<?php
+
/**
* @file
- * Views' relationship handlers.
+ * Definition of views_handler_relationship_node_term_data.
*/
-
/**
* Relationship handler to return the taxonomy terms of nodes.
*
@@ -58,8 +58,8 @@ class views_handler_relationship_node_term_data extends views_handler_relationsh
$def['table'] = 'taxonomy_term_data';
if (!array_filter($this->options['vocabularies'])) {
- $term_node = $this->query->add_table('taxonomy_index', $this->relationship);
- $def['left_table'] = 'taxonomy_index';
+ $taxonomy_index = $this->query->add_table('taxonomy_index', $this->relationship);
+ $def['left_table'] = $taxonomy_index;
$def['left_field'] = 'tid';
$def['field'] = 'tid';
$def['type'] = empty($this->options['required']) ? 'LEFT' : 'INNER';
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
index 17ee634..9c1d81f 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
@@ -1,9 +1,13 @@
<?php
+
/**
* @file
- * Taxonomy tid default argument.
+ * Definition of views_plugin_argument_default_taxonomy_tid.
*/
+/**
+ * Taxonomy tid default argument.
+ */
class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_default {
function init(&$view, &$argument, $options) {
parent::init($view, $argument, $options);
@@ -22,10 +26,10 @@ class views_plugin_argument_default_taxonomy_tid extends views_plugin_argument_d
function option_definition() {
$options = parent::option_definition();
- $options['term_page'] = array('default' => TRUE);
- $options['node'] = array('default' => FALSE);
+ $options['term_page'] = array('default' => TRUE, 'bool' => TRUE);
+ $options['node'] = array('default' => FALSE, 'bool' => TRUE);
$options['anyall'] = array('default' => ',');
- $options['limit'] = array('default' => FALSE);
+ $options['limit'] = array('default' => FALSE, 'bool' => TRUE);
$options['vocabularies'] = array('default' => array());
return $options;
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index c81c619..3a88199 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the 'taxonomy term' argument validator plugin.
@@ -26,7 +27,7 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
$options = parent::option_definition();
$options['vocabularies'] = array('default' => array());
$options['type'] = array('default' => 'tid');
- $options['transform'] = array('default' => FALSE);
+ $options['transform'] = array('default' => FALSE, 'bool' => TRUE);
return $options;
}