summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Wehner2011-03-17 23:21:16 (GMT)
committerDaniel Wehner2011-03-17 23:21:16 (GMT)
commitbe9b7bff6e7b228c1c297149380def6e0cc2c61f (patch)
tree55e94224ed1143f0f7602d55b6b9927dea0aa3a6
parent10c3f75588eb86b5749b2e07ee9ebe15bcd55919 (diff)
parent323fc34f0dda0abf32b3cef4d26b24a513452cf8 (diff)
Merge branch 'd7v3ui' of git.drupal.org:project/views into d7v3uid7v3ui
-rw-r--r--handlers/views_handler_argument.inc14
-rw-r--r--handlers/views_handler_argument_string.inc1
-rw-r--r--handlers/views_handler_field.inc41
-rw-r--r--handlers/views_handler_field_counter.inc1
-rw-r--r--handlers/views_handler_field_date.inc1
-rw-r--r--handlers/views_handler_field_numeric.inc3
-rw-r--r--handlers/views_handler_field_prerender_list.inc1
-rw-r--r--handlers/views_handler_field_serialized.inc3
-rw-r--r--handlers/views_handler_filter.inc1
-rw-r--r--handlers/views_handler_filter_in_operator.inc1
-rw-r--r--handlers/views_handler_filter_numeric.inc2
-rw-r--r--handlers/views_handler_filter_string.inc1
-rw-r--r--help/api-upgrading.html9
-rw-r--r--plugins/views_plugin_argument_default_php.inc1
-rw-r--r--plugins/views_plugin_display_feed.inc1
-rw-r--r--plugins/views_plugin_display_page.inc8
-rw-r--r--plugins/views_plugin_exposed_form.inc1
-rw-r--r--plugins/views_plugin_pager_full.inc4
-rw-r--r--plugins/views_plugin_style_rss.inc1
-rw-r--r--plugins/views_plugin_style_summary.inc1
-rw-r--r--plugins/views_plugin_style_table.inc5
21 files changed, 15 insertions, 86 deletions
diff --git a/handlers/views_handler_argument.inc b/handlers/views_handler_argument.inc
index f4c40ea..59c0471 100644
--- a/handlers/views_handler_argument.inc
+++ b/handlers/views_handler_argument.inc
@@ -229,7 +229,6 @@ class views_handler_argument extends views_handler {
'#size' => 20,
'#default_value' => $this->options['exception']['title'],
'#description' => t('Override the view and other argument titles. Use "%1" for the first argument, "%2" for the second, etc.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-exception-title-enable' => array('1'),
),
@@ -265,7 +264,6 @@ class views_handler_argument extends views_handler {
'#title_display' => 'invisible',
'#default_value' => $this->options['title'],
'#description' => t('Override the view and other argument titles. Use "%1" for the first argument, "%2" for the second, etc.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-title-enable' => array('1'),
),
@@ -284,7 +282,6 @@ class views_handler_argument extends views_handler {
'#title_display' => 'invisible',
'#default_value' => $this->options['breadcrumb'],
'#description' => t('Enter a breadcrumb name you would like to use. See "Title" for percent substitutions.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-breadcrumb-enable' => array('1'),
),
@@ -308,7 +305,6 @@ class views_handler_argument extends views_handler {
'#type' => 'select',
'#title' => t('Validator'),
'#default_value' => $this->options['validate']['type'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-specify-validation' => array('1'),
),
@@ -345,7 +341,6 @@ class views_handler_argument extends views_handler {
'#suffix' => '</div>',
'#type' => 'item',
'#input' => TRUE, // trick it into checking input to make #process run
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-specify-validation' => array('1'),
'edit-options-validate-type' => array($id),
@@ -368,7 +363,6 @@ class views_handler_argument extends views_handler {
'#title' => t('Action to take if filter value does not validate'),
'#default_value' => $this->options['validate']['fail'],
'#options' => $validate_options,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-specify-validation' => array('1'),
),
@@ -502,7 +496,7 @@ class views_handler_argument extends views_handler {
'#id' => 'edit-options-default-argument-type',
'#title' => t('Type'),
'#default_value' => $this->options['default_argument_type'],
- '#process' => array('ctools_dependent_process'),
+
'#dependency' => array('radio:options[default_action]' => array('default')),
// Views custom key, moves this element to the appropriate container
// under the radio button.
@@ -522,8 +516,6 @@ class views_handler_argument extends views_handler {
'#suffix' => '</div>',
'#id' => 'edit-options-argument-default-options-' . $id,
'#type' => 'item',
- '#input' => TRUE, // trick it into checking input to make #process run
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'radio:options[default_action]' => array('default'),
'edit-options-default-argument-type' => array($id)
@@ -565,7 +557,6 @@ class views_handler_argument extends views_handler {
'#title' => t('Sort order'),
'#options' => array('asc' => t('Ascending'), 'desc' => t('Descending')),
'#default_value' => $this->options['summary']['sort_order'],
- '#process' => array('form_process_radios', 'ctools_dependent_process'),
'#dependency' => array('radio:options[default_action]' => array('summary')),
);
$form['summary']['number_of_records'] = array(
@@ -576,7 +567,6 @@ class views_handler_argument extends views_handler {
0 => $this->get_sort_name(),
1 => t('Number of records')
),
- '#process' => array('form_process_radios', 'ctools_dependent_process'),
'#dependency' => array('radio:options[default_action]' => array('summary')),
);
@@ -585,7 +575,6 @@ class views_handler_argument extends views_handler {
'#title' => t('Format'),
'#options' => $format_options,
'#default_value' => $this->options['summary']['format'],
- '#process' => array('form_process_radios', 'ctools_dependent_process'),
'#dependency' => array('radio:options[default_action]' => array('summary')),
);
@@ -601,7 +590,6 @@ class views_handler_argument extends views_handler {
'#id' => 'edit-options-summary-options-' . $id,
'#type' => 'item',
'#input' => TRUE, // trick it into checking input to make #process run
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'radio:options[default_action]' => array('summary'),
'radio:options[summary][format]' => array($id),
diff --git a/handlers/views_handler_argument_string.inc b/handlers/views_handler_argument_string.inc
index a615661..a45ae4e 100644
--- a/handlers/views_handler_argument_string.inc
+++ b/handlers/views_handler_argument_string.inc
@@ -52,7 +52,6 @@ class views_handler_argument_string extends views_handler_argument {
'#title' => t('Character limit'),
'#description' => t('How many characters of the filter value to filter against. If set to 1, all fields starting with the first letter in the filter value would be matched.'),
'#default_value' => $this->options['limit'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-glossary' => array(TRUE)),
'#fieldset' => 'more',
);
diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index 0e53254..80412e5 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -315,14 +315,20 @@ class views_handler_field extends views_handler {
),
);
$options['element_type'] = array('default' => '');
+ $options['element_type_enable'] = array('default' => FALSE);
$options['element_class'] = array('default' => '');
+ $options['element_class_enable'] = array('default' => FALSE);
$options['element_label_type'] = array('default' => '');
+ $options['element_label_type_enable'] = array('default' => FALSE);
$options['element_label_class'] = array('default' => '');
+ $options['element_label_class_enable'] = array('default' => FALSE);
$options['element_label_colon'] = array('default' => TRUE);
$options['element_wrapper_type'] = array('default' => '');
+ $options['element_wrapper_type_enable'] = array('default' => FALSE);
$options['element_wrapper_class'] = array('default' => '');
+ $options['element_wrapper_class_enable'] = array('default' => FALSE);
$options['element_default_classes'] = array('default' => TRUE);
@@ -344,6 +350,7 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Wrap field in HTML'),
'#fieldset' => 'style_settings',
+ '#default_value' => $this->options['element_type_enable'],
);
$form['element_type'] = array(
'#title' => t('HTML element'),
@@ -352,7 +359,6 @@ class views_handler_field extends views_handler {
'#default_value' => $this->options['element_type'],
'#description' => t('Choose the HTML element to wrap around this field, e.g. H1, H2, etc.'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-type-enable' => array(1)
),
@@ -362,10 +368,10 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-type-enable' => array(1)
),
+ '#default_value' => $this->options['element_class_enable'],
);
$form['element_class'] = array(
@@ -374,7 +380,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['element_class'],
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-class-enable' => array(1)
),
@@ -392,7 +397,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#title' => t('Label'),
'#default_value' => $label,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-custom-label' => array(1)
),
@@ -402,7 +406,6 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Place a colon after the label'),
'#default_value' => $this->options['element_label_colon'],
- '#process' => array_merge(element_info_property('checkbox', '#process', array()), array('ctools_dependent_process')),
'#dependency' => array(
'edit-options-custom-label' => array(1)
),
@@ -412,6 +415,7 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Wrap label in HTML'),
'#fieldset' => 'style_settings',
+ '#default_value' => $this->options['element_label_type_enable'],
);
$form['element_label_type'] = array(
@@ -421,7 +425,6 @@ class views_handler_field extends views_handler {
'#default_value' => $this->options['element_label_type'],
'#description' => t('Choose the HTML element to wrap around this label, e.g. H1, H2, etc.'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-label-type-enable' => array(1)
),
@@ -431,10 +434,10 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-label-type-enable' => array(1)
),
+ '#default_value' => $this->options['element_label_class_enable'],
);
$form['element_label_class'] = array(
@@ -443,7 +446,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['element_label_class'],
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-label-class-enable' => array(1)
),
@@ -453,6 +455,7 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Wrap field and label in HTML'),
'#fieldset' => 'style_settings',
+ '#default_value' => $this->options['element_wrapper_type_enable'],
);
$form['element_wrapper_type'] = array(
@@ -462,7 +465,6 @@ class views_handler_field extends views_handler {
'#default_value' => $this->options['element_wrapper_type'],
'#description' => t('Choose the HTML element to wrap around this field and label, e.g. H1, H2, etc.'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-wrapper-type-enable' => array(1)
),
@@ -472,10 +474,10 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Create a CSS class'),
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-wrapper-type-enable' => array(1)
),
+ '#default_value' => $this->options['element_wrapper_class_enable'],
);
$form['element_wrapper_class'] = array(
@@ -484,7 +486,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['element_wrapper_class'],
'#fieldset' => 'style_settings',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-element-wrapper-class-enable' => array(1)
),
@@ -533,7 +534,6 @@ class views_handler_field extends views_handler {
'#type' => 'textarea',
'#default_value' => $this->options['alter']['text'],
'#description' => t('The text to display for this field. You may include HTML. You may enter data from this view as per the "Replacement patterns" below.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-alter-text' => array(1)
),
@@ -550,7 +550,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['path'],
'#description' => t('The Drupal path or absolute URL for this link. You may enter data from this view as per the "Replacement patterns" below.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -560,7 +559,6 @@ class views_handler_field extends views_handler {
'#type' => 'checkbox',
'#title' => t('Use absolute path'),
'#default_value' => $this->options['alter']['absolute'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -570,7 +568,6 @@ class views_handler_field extends views_handler {
'#title' => t('External server URL'),
'#default_value' => $this->options['alter']['external'],
'#description' => t("Links to an external server using a full URL: e.g. 'http://www.example.com' or 'www.example.com'."),
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -581,7 +578,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['link_class'],
'#description' => t('The CSS class to apply to the link.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -591,7 +587,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['alt'],
'#description' => t('Text to place as "alt" text which most browsers display as a tooltip when hovering over the link.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -601,7 +596,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['rel'],
'#description' => t('Include Rel attribute for use in lightbox2 or other javascript utility.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -611,7 +605,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['prefix'],
'#description' => t('Any text to display before this link. You may include HTML.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -621,7 +614,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['suffix'],
'#description' => t('Any text to display after this link. You may include HTML.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -631,7 +623,6 @@ class views_handler_field extends views_handler {
'#type' => 'textfield',
'#default_value' => $this->options['alter']['target'],
'#description' => t("Target of the link, such as _blank, _parent or an iframe's name. This field is rarely used."),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1)
),
@@ -683,7 +674,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#type' => 'hidden',
'#id' => 'views-tokens-help',
'#prefix' => '<div><fieldset id="views-tokens-help"><legend>' . t('Replacement patterns') . '</legend>' . $output . '</fieldset></div>',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-make-link' => array(1),
'edit-options-alter-alter-text' => array(1),
@@ -702,7 +692,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#type' => 'textfield',
'#default_value' => $this->options['alter']['max_length'],
'#description' => t('The maximum number of characters this field can be.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-trim' => array(1)
),
@@ -713,7 +702,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#title' => t('Trim only on a word boundary'),
'#description' => t('If checked, this field be trimmed only on a word boundary. This is guaranteed to be the maximum characters stated or less. If there are no word boundaries this could trim a field to nothing.'),
'#default_value' => $this->options['alter']['word_boundary'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-trim' => array(1)
),
@@ -724,7 +712,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#title' => t('Add an ellipsis'),
'#description' => t('If checked, a "..." will be added if a field was trimmed.'),
'#default_value' => $this->options['alter']['ellipsis'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-trim' => array(1)
),
@@ -735,7 +722,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#title' => t('Field can contain HTML'),
'#description' => t('If checked, HTML corrector will be run to ensure tags are properly closed after trimming.'),
'#default_value' => $this->options['alter']['html'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array(
'edit-options-alter-trim' => array(1)
),
@@ -746,7 +732,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#title' => t('Strip HTML tags'),
'#description' => t('If checked, all HTML tags will be stripped.'),
'#default_value' => $this->options['alter']['strip_tags'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
);
$form['alter']['preserve_tags'] = array(
'#type' => 'textfield',
@@ -756,7 +741,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#dependency' => array(
'edit-options-alter-strip-tags' => array(1),
),
- '#process' => array('ctools_dependent_process'),
);
$form['alter']['nl2br'] = array(
@@ -764,7 +748,6 @@ If you would like to have the characters %5B and %5D please use the html entity
'#title' => t('Convert newlines to HTML &lt;br&gt; tags'),
'#description' => t('If checked, all newlines chars (e.g. \n) are converted into HTML &lt;br&gt; tags.'),
'#default_value' => $this->options['alter']['nl2br'],
- '#process' => array('ctools_dependent_process'),
);
}
diff --git a/handlers/views_handler_field_counter.inc b/handlers/views_handler_field_counter.inc
index 720a973..bd0db1d 100644
--- a/handlers/views_handler_field_counter.inc
+++ b/handlers/views_handler_field_counter.inc
@@ -13,7 +13,6 @@ class views_handler_field_counter extends views_handler_field {
'#title' => t('Starting value'),
'#default_value' => $this->options['counter_start'],
'#description' => t('Specify the number the counter should start at.'),
- //'#process' => array('ctools_dependent_process'),
'#size' => 2,
);
diff --git a/handlers/views_handler_field_date.inc b/handlers/views_handler_field_date.inc
index 574b3c5..d9dd10b 100644
--- a/handlers/views_handler_field_date.inc
+++ b/handlers/views_handler_field_date.inc
@@ -38,7 +38,6 @@ class views_handler_field_date extends views_handler_field {
'#title' => t('Custom date format'),
'#description' => t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. If "Time ago" this is the the number of different units to display, which defaults to two.'),
'#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-date-format' => array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span')),
);
diff --git a/handlers/views_handler_field_numeric.inc b/handlers/views_handler_field_numeric.inc
index 6a6629c..5a99000 100644
--- a/handlers/views_handler_field_numeric.inc
+++ b/handlers/views_handler_field_numeric.inc
@@ -38,7 +38,6 @@ class views_handler_field_numeric extends views_handler_field {
'#title' => t('Precision'),
'#default_value' => $this->options['precision'],
'#description' => t('Specify how many digits to print after the decimal point.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-set-precision' => array(TRUE)),
'#size' => 2,
);
@@ -68,7 +67,6 @@ class views_handler_field_numeric extends views_handler_field {
'#title' => t('Singular form'),
'#default_value' => $this->options['format_plural_singular'],
'#description' => t('Text to use for the singular form.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-format-plural' => array(TRUE)),
);
$form['format_plural_plural'] = array(
@@ -76,7 +74,6 @@ class views_handler_field_numeric extends views_handler_field {
'#title' => t('Plural form'),
'#default_value' => $this->options['format_plural_plural'],
'#description' => t('Text to use for the plural form, @count will be replaced with the value.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-format-plural' => array(TRUE)),
);
$form['prefix'] = array(
diff --git a/handlers/views_handler_field_prerender_list.inc b/handlers/views_handler_field_prerender_list.inc
index e591a18..9cc719c 100644
--- a/handlers/views_handler_field_prerender_list.inc
+++ b/handlers/views_handler_field_prerender_list.inc
@@ -36,7 +36,6 @@ class views_handler_field_prerender_list extends views_handler_field {
'#type' => 'textfield',
'#title' => t('Separator'),
'#default_value' => $this->options['separator'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:options[type]' => array('separator')),
);
parent::options_form($form, $form_state);
diff --git a/handlers/views_handler_field_serialized.inc b/handlers/views_handler_field_serialized.inc
index 4ddbbbd..e5daa6e 100644
--- a/handlers/views_handler_field_serialized.inc
+++ b/handlers/views_handler_field_serialized.inc
@@ -1,7 +1,7 @@
<?php
class views_handler_field_serialized extends views_handler_field {
-
+
function option_definition() {
$options = parent::option_definition();
$options['format'] = array('default' => 'unserialized');
@@ -28,7 +28,6 @@ class views_handler_field_serialized extends views_handler_field {
'#type' => 'textfield',
'#title' => t('Which key should be displayed'),
'#default_value' => $this->options['key'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-options-format' => array('key')),
);
}
diff --git a/handlers/views_handler_filter.inc b/handlers/views_handler_filter.inc
index ef52754..af44d19 100644
--- a/handlers/views_handler_filter.inc
+++ b/handlers/views_handler_filter.inc
@@ -302,7 +302,6 @@ class views_handler_filter extends views_handler {
'#title' => t('Operator identifier'),
'#size' => 40,
'#description' => t('This will appear in the URL after the ? to identify this operator.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-options-expose-use-operator' => array(1)
),
diff --git a/handlers/views_handler_filter_in_operator.inc b/handlers/views_handler_filter_in_operator.inc
index a007300..1d08e6a 100644
--- a/handlers/views_handler_filter_in_operator.inc
+++ b/handlers/views_handler_filter_in_operator.inc
@@ -215,7 +215,6 @@ class views_handler_filter_in_operator extends views_handler_filter {
$form['value']['#prefix'] = '<div id="edit-options-value-wrapper">';
$form['value']['#suffix'] = '</div>';
}
- $process[] = 'ctools_dependent_process';
$form['value']['#dependency'] = array($source => $this->operator_values(1));
}
if (!empty($process)) {
diff --git a/handlers/views_handler_filter_numeric.inc b/handlers/views_handler_filter_numeric.inc
index 9ee47d7..e28116c 100644
--- a/handlers/views_handler_filter_numeric.inc
+++ b/handlers/views_handler_filter_numeric.inc
@@ -147,7 +147,6 @@ class views_handler_filter_numeric extends views_handler_filter {
'#title' => empty($form_state['exposed']) ? t('Value') : '',
'#size' => 30,
'#default_value' => $this->value['value'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($source => $this->operator_values(1)),
);
if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier]['value'])) {
@@ -183,7 +182,6 @@ class views_handler_filter_numeric extends views_handler_filter {
);
if ($which == 'all') {
$dependency = array(
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($source => $this->operator_values(2)),
);
$form['value']['min'] += $dependency;
diff --git a/handlers/views_handler_filter_string.inc b/handlers/views_handler_filter_string.inc
index 5adcd9e..79baf91 100644
--- a/handlers/views_handler_filter_string.inc
+++ b/handlers/views_handler_filter_string.inc
@@ -191,7 +191,6 @@ class views_handler_filter_string extends views_handler_filter {
if ($which == 'all') {
$form['value'] += array(
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($source => $this->operator_values(1)),
);
}
diff --git a/help/api-upgrading.html b/help/api-upgrading.html
index 071cc9f..1a2540d 100644
--- a/help/api-upgrading.html
+++ b/help/api-upgrading.html
@@ -29,14 +29,7 @@ Everyone who used it can extend from views_handler_sort, too.
<h3>Ctools dependency</h3>
Views requires ctools now, so it can use the dependency system of ctools.
-The only thing you have to do is to replace
-<pre>
-'#process' => array('views_process_dependency')
-</pre>
-with
-<pre>
-'#process' => array('ctools_dependent_process'),
-</pre>
+The only thing you have to do is to remove views_process_dependency.
<h3>Changed add_where api</h3>
If your field is a plain sql field:
diff --git a/plugins/views_plugin_argument_default_php.inc b/plugins/views_plugin_argument_default_php.inc
index 607b16e..699dae7 100644
--- a/plugins/views_plugin_argument_default_php.inc
+++ b/plugins/views_plugin_argument_default_php.inc
@@ -20,7 +20,6 @@ class views_plugin_argument_default_php extends views_plugin_argument_default {
'#type' => 'textarea',
'#title' => t('PHP contextual filter code'),
'#default_value' => $this->options['code'],
- '#process' => array('ctools_dependent_process'),
'#description' => t('Enter PHP code that returns a value to use for this filter. Do not use &lt;?php ?&gt;. You must return only a single value for just this filter.'),
);
diff --git a/plugins/views_plugin_display_feed.inc b/plugins/views_plugin_display_feed.inc
index 885a9b7..7eb99ae 100644
--- a/plugins/views_plugin_display_feed.inc
+++ b/plugins/views_plugin_display_feed.inc
@@ -152,7 +152,6 @@ class views_plugin_display_feed extends views_plugin_display_page {
'#default_value' => $this->get_option('sitename_title'),
);
$form['title'] = $title;
- $form['title']['#process'] = array('ctools_dependent_process');
$form['title']['#dependency'] = array('edit-sitename-title' => array(FALSE));
break;
case 'displays':
diff --git a/plugins/views_plugin_display_page.inc b/plugins/views_plugin_display_page.inc
index f80864a..3e0d49b 100644
--- a/plugins/views_plugin_display_page.inc
+++ b/plugins/views_plugin_display_page.inc
@@ -335,7 +335,6 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $menu['title'],
'#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
);
$form['menu']['description'] = array(
@@ -343,7 +342,6 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $menu['description'],
'#description' => t("If set to normal or tab, enter the text to use for the menu item's description."),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
);
@@ -355,7 +353,6 @@ class views_plugin_display_page extends views_plugin_display {
'#options' => menu_get_menus(),
'#default_value' => $menu['name'],
'#description' => t('Insert item into an available menu.'), //
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('normal')),
);
}
@@ -374,7 +371,6 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
'#description' => t('The lower the weight the higher/further left it will appear.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
);
break;
@@ -408,7 +404,6 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $tab_options['title'],
'#description' => t('If creating a parent menu item, enter the title of the item.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
);
$form['tab_options']['description'] = array(
@@ -416,7 +411,6 @@ class views_plugin_display_page extends views_plugin_display {
'#type' => 'textfield',
'#default_value' => $tab_options['description'],
'#description' => t('If creating a parent menu item, enter the description of the item.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
);
// Only display the menu selector if menu module is enabled.
@@ -427,7 +421,6 @@ class views_plugin_display_page extends views_plugin_display {
'#options' => menu_get_menus(),
'#default_value' => $tab_options['name'],
'#description' => t('Insert item into an available menu.'),
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array('radio:tab_options[type]' => array('normal')),
);
}
@@ -447,7 +440,6 @@ class views_plugin_display_page extends views_plugin_display {
'#default_value' => $tab_options['weight'],
'#size' => 5,
'#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:tab_options[type]' => array('tab')),
);
break;
diff --git a/plugins/views_plugin_exposed_form.inc b/plugins/views_plugin_exposed_form.inc
index b4be8cf..6a04a9e 100644
--- a/plugins/views_plugin_exposed_form.inc
+++ b/plugins/views_plugin_exposed_form.inc
@@ -56,7 +56,6 @@ class views_plugin_exposed_form extends views_plugin {
'#dependency' => array(
'edit-exposed-form-options-reset-button' => array(1)
),
- '#process' => array('ctools_dependent_process'),
);
$form['exposed_sorts_label'] = array(
diff --git a/plugins/views_plugin_pager_full.inc b/plugins/views_plugin_pager_full.inc
index 54e8f03..a0a448f 100644
--- a/plugins/views_plugin_pager_full.inc
+++ b/plugins/views_plugin_pager_full.inc
@@ -89,7 +89,6 @@ class views_plugin_pager_full extends views_plugin_pager {
'#required' => TRUE,
'#description' => t('Label to use in the exposed items per page form element.'),
'#default_value' => $this->options['expose']['items_per_page_label'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-pager-options-expose-items-per-page' => array(1)
),
@@ -101,7 +100,6 @@ class views_plugin_pager_full extends views_plugin_pager {
'#required' => TRUE,
'#description' => t('Set between which values the user can choose when determining the items per page. Separated by comma.'),
'#default_value' => $this->options['expose']['items_per_page_options'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-pager-options-expose-items-per-page' => array(1)
),
@@ -120,7 +118,6 @@ class views_plugin_pager_full extends views_plugin_pager {
'#title' => t('All items label'),
'#description' => t('Which label will be used to display all items'),
'#default_value' => $this->options['expose']['items_per_page_options_all_label'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-items-per-page-options-all' => array(1),
),
@@ -139,7 +136,6 @@ class views_plugin_pager_full extends views_plugin_pager {
'#required' => TRUE,
'#description' => t('Label to use in the exposed offset form element.'),
'#default_value' => $this->options['expose']['offset_label'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array(
'edit-pager-options-expose-offset' => array(1)
),
diff --git a/plugins/views_plugin_style_rss.inc b/plugins/views_plugin_style_rss.inc
index 2311216..0a0598e 100644
--- a/plugins/views_plugin_style_rss.inc
+++ b/plugins/views_plugin_style_rss.inc
@@ -56,7 +56,6 @@ class views_plugin_style_rss extends views_plugin_style {
'#title' => t('RSS description'),
'#default_value' => $this->options['description'],
'#description' => t('This will appear in the RSS feed itself.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-style-options-override' => array(FALSE)),
);
}
diff --git a/plugins/views_plugin_style_summary.inc b/plugins/views_plugin_style_summary.inc
index a6aad46..527dd3b 100644
--- a/plugins/views_plugin_style_summary.inc
+++ b/plugins/views_plugin_style_summary.inc
@@ -52,7 +52,6 @@ class views_plugin_style_summary extends views_plugin_style {
'#type' => 'textfield',
'#title' => t('Items to display'),
'#default_value' => $this->options['items_per_page'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-style-options-override' => array(TRUE)),
);
}
diff --git a/plugins/views_plugin_style_table.inc b/plugins/views_plugin_style_table.inc
index 76b5b7d..9d8d9d4 100644
--- a/plugins/views_plugin_style_table.inc
+++ b/plugins/views_plugin_style_table.inc
@@ -203,14 +203,12 @@ class views_plugin_style_table extends views_plugin_style {
$form['info'][$field]['sortable'] = array(
'#type' => 'checkbox',
'#default_value' => !empty($this->options['info'][$field]['sortable']),
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array($id => array($field)),
);
$form['info'][$field]['default_sort_order'] = array(
'#type' => 'select',
'#options' => array('asc' => t('Ascending'), 'desc' => t('Descending')),
'#default_value' => !empty($this->options['info'][$field]['default_sort_order']) ? $this->options['info'][$field]['default_sort_order'] : 'asc',
- '#process' => array('ctools_dependent_process'),
'#dependency_count' => 2,
'#dependency' => array($id => array($field), 'edit-style-options-info-' . $safe . '-sortable' => array(1)),
);
@@ -224,7 +222,6 @@ class views_plugin_style_table extends views_plugin_style {
// because 'radio' doesn't fully support '#id' =(
'#attributes' => array('id' => $radio_id),
'#default_value' => $default,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($id => array($field)),
);
}
@@ -237,14 +234,12 @@ class views_plugin_style_table extends views_plugin_style {
'views-align-center' => t('Center'),
'views-align-right' => t('Right'),
),
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array($id => array($field)),
);
$form['info'][$field]['separator'] = array(
'#type' => 'textfield',
'#size' => 10,
'#default_value' => isset($this->options['info'][$field]['separator']) ? $this->options['info'][$field]['separator'] : '',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($id => array($field)),
);