summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2011-04-27 23:44:06 (GMT)
committer Earl Miles2011-04-27 23:44:06 (GMT)
commit24381eed5f2a3fd9677d28ce5ee235359affeb5c (patch)
tree3986eb9ff11ebad2248505d692baa0f5b74a65e9
parent921cf84587e1c3f3e27fdf6f4eb82dd07dadec09 (diff)
Remove no longer necessary #process lines for #dependency
-rw-r--r--includes/content.inc1
-rw-r--r--page_manager/page_manager.admin.inc1
-rw-r--r--page_manager/plugins/task_handlers/http_response.inc1
-rw-r--r--page_manager/plugins/tasks/page.admin.inc7
-rw-r--r--plugins/access/term.inc1
-rw-r--r--plugins/access/term_has_parent.inc15
-rw-r--r--plugins/content_types/custom/custom.inc3
-rw-r--r--plugins/content_types/node_context/node_terms.inc2
-rw-r--r--plugins/content_types/search/search_form.inc2
-rw-r--r--plugins/content_types/search/search_result.inc6
-rw-r--r--plugins/contexts/term.inc1
-rw-r--r--plugins/contexts/user.inc2
-rw-r--r--views_content/plugins/content_types/views.inc4
-rw-r--r--views_content/plugins/content_types/views_row.inc1
-rw-r--r--views_content/plugins/views/views_content_plugin_display_ctools_context.inc2
-rw-r--r--views_content/plugins/views/views_content_plugin_display_panel_pane.inc5
16 files changed, 7 insertions, 47 deletions
diff --git a/includes/content.inc b/includes/content.inc
index b570479..a55f7ec 100644
--- a/includes/content.inc
+++ b/includes/content.inc
@@ -498,7 +498,6 @@ function ctools_content_configure_form_defaults($form, &$form_state) {
'#default_value' => isset($conf['override_title_text']) ? $conf['override_title_text'] : '',
'#size' => 35,
'#id' => 'override-title-textfield',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('override-title-checkbox' => array(1)),
'#dependency_type' => 'disable',
);
diff --git a/page_manager/page_manager.admin.inc b/page_manager/page_manager.admin.inc
index cdf4008..85608f7 100644
--- a/page_manager/page_manager.admin.inc
+++ b/page_manager/page_manager.admin.inc
@@ -1414,7 +1414,6 @@ function page_manager_handler_add_form($form, $form_state, $features = array())
if ($plugin != 'default') {
$form['features'][$plugin][$feature_id] += array(
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-handler' => array($plugin)),
);
}
diff --git a/page_manager/plugins/task_handlers/http_response.inc b/page_manager/plugins/task_handlers/http_response.inc
index 72c98ca..ba549b4 100644
--- a/page_manager/plugins/task_handlers/http_response.inc
+++ b/page_manager/plugins/task_handlers/http_response.inc
@@ -235,7 +235,6 @@ function page_manager_http_response_edit_settings($form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Redirect destination'),
'#default_value' => $conf['destination'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-code' => array(301)),
'#description' => t('Enter the path to redirect to. You may use keyword substitutions from contexts. You can use external urls (http://www.example.com/foo) or internal urls (node/1).'),
);
diff --git a/page_manager/plugins/tasks/page.admin.inc b/page_manager/plugins/tasks/page.admin.inc
index d4b67de..cf33301 100644
--- a/page_manager/plugins/tasks/page.admin.inc
+++ b/page_manager/plugins/tasks/page.admin.inc
@@ -699,7 +699,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#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', 'action')),
);
@@ -713,7 +712,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#options' => menu_get_menus(),
'#default_value' => $menu['name'],
'#description' => t('Insert item into an available menu.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('normal')),
);
}
@@ -731,7 +729,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#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', 'action')),
);
@@ -743,7 +740,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#options' => array('none' => t('No menu entry'), 'normal' => t('Normal menu item'), 'tab' => t('Menu tab')),
'#default_value' => $menu['parent']['type'],
'#description' => t('When providing a menu item as a default tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is <em>foo/bar/baz</em>, the parent path would be <em>foo/bar</em>.'),
- '#process' => array('form_process_radios', 'ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('default tab')),
);
$form['menu']['parent']['title'] = array(
@@ -751,7 +747,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#type' => 'textfield',
'#default_value' => $menu['parent']['title'],
'#description' => t('If creating a parent menu item, enter the title of the item.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('normal', 'tab')),
'#dependency_count' => 2,
);
@@ -763,7 +758,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#options' => menu_get_menus(),
'#default_value' => $menu['parent']['name'],
'#description' => t('Insert item into an available menu.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('normal')),
'#dependency_count' => 2,
);
@@ -780,7 +774,6 @@ function page_manager_page_form_menu($form, &$form_state) {
'#default_value' => $menu['parent']['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:menu[type]' => array('default tab'), 'radio:menu[parent][type]' => array('tab')),
'#dependency_count' => 2,
);
diff --git a/plugins/access/term.inc b/plugins/access/term.inc
index 2b39ff4..043f421 100644
--- a/plugins/access/term.inc
+++ b/plugins/access/term.inc
@@ -60,7 +60,6 @@ function ctools_term_ctools_access_settings($form, &$form_state, $conf) {
$form['settings'][$vocabulary->vid] = array(
'#title' => t('Terms'),
'#description' => t('Select a term or terms from @vocabulary.', array('@vocabulary' => $vocabulary->name)), //. $description,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('ctools-select-vid' => array($vocabulary->vid)),
'#default_value' => !empty($conf[$vid]) ? $conf[$vid] : '',
'#multiple' => TRUE,
diff --git a/plugins/access/term_has_parent.inc b/plugins/access/term_has_parent.inc
index 9fd4c6d..2c86d1c 100644
--- a/plugins/access/term_has_parent.inc
+++ b/plugins/access/term_has_parent.inc
@@ -33,7 +33,7 @@ function ctools_term_has_parent_ctools_access_settings($form, &$form_state, $con
if (!isset($conf['vid'])) {
$conf['vid'] = 0;
}
-
+
$form['settings']['vid'] = array(
'#title' => t('Vocabulary'),
'#type' => 'select',
@@ -59,7 +59,6 @@ function ctools_term_has_parent_ctools_access_settings($form, &$form_state, $con
$form['settings'][$vid] = array(
'#title' => t('Terms'),
'#description' => t('Select a term or terms from @vocabulary.', array('@vocabulary' => $vocabulary->name)),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('ctools-select-vid' => array($vocabulary->vid)),
'#default_value' => !empty($conf[$vid]) ? $conf[$vid] : '',
'#size' => 10,
@@ -102,7 +101,7 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) {
return FALSE;
}
$vid = $conf['vid'];
-
+
// we'll start looking up the hierarchy from our context term id.
$current_term = $context->data->tid;
@@ -113,29 +112,29 @@ function ctools_term_has_parent_ctools_access_check($conf, $context) {
// select parent as term_parent to avoid PHP5 complications with the parent keyword
//@todo: Find a way to reduce the number of queries required for really deep hierarchies.
$term = db_query("SELECT parent AS term_parent, tid AS tid FROM {taxonomy_term_hierarchy} th WHERE th.tid = :tid", array(':tid'=>$current_term))->fetchObject();
-
+
// if no term is found, get out of the loop
if (!$term || empty($term->tid)) {
break;
}
-
+
// check the term selected, if the user asked it to.
if (!empty($conf['include_self']) && in_array($term->tid, $conf[$vid])) {
return TRUE;
}
-
+
// did we find the parent TID we were looking for?
if (in_array($term->term_parent, $conf[$vid])) {
// YES, we're done!
return TRUE;
}
// Nope, we didn't find it.
-
+
// If this is the top of the hierarchy, stop scanning.
if ($term->term_parent==0) {
break;
}
-
+
// update the parent, and keep scanning.
$current_term = $term->term_parent;
}
diff --git a/plugins/content_types/custom/custom.inc b/plugins/content_types/custom/custom.inc
index 9376530..6a705ac 100644
--- a/plugins/content_types/custom/custom.inc
+++ b/plugins/content_types/custom/custom.inc
@@ -321,7 +321,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Machine name'),
'#description' => t('The machine readable name of this content. It must be unique, and it must contain only alphanumeric characters and underscores. Once created, you will not be able to change this value!'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-reusable' => array(1)),
);
@@ -329,7 +328,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
'#type' => 'textfield',
'#title' => t('Category'),
'#description' => t('What category this content should appear in. If left blank the category will be "Miscellaneous".'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-reusable' => array(1)),
);
@@ -337,7 +335,6 @@ function ctools_custom_content_type_edit_form($form, &$form_state) {
'#type' => 'textarea',
'#title' => t('Administrative description'),
'#description' => t('A description of what this content is, does or is for, for administrative use.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-reusable' => array(1)),
);
return $form;
diff --git a/plugins/content_types/node_context/node_terms.inc b/plugins/content_types/node_context/node_terms.inc
index 3ea1fcd..e2e7391 100644
--- a/plugins/content_types/node_context/node_terms.inc
+++ b/plugins/content_types/node_context/node_terms.inc
@@ -146,7 +146,6 @@ function ctools_node_terms_content_type_edit_form($form, &$form_state) {
'#type' => 'checkbox',
'#default_value' => $conf['link'],
'#description' => t('Check here to make the terms link to the term paths.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:term_format' => array('inline-delimited', 'ul')),
'#prefix' => '<div class="clearfix">',
'#suffix' => '</div>',
@@ -157,7 +156,6 @@ function ctools_node_terms_content_type_edit_form($form, &$form_state) {
'#title' => t('Term delimiter'),
'#default_value' => $conf['term_delimiter'],
'#size' => 10,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:term_format' => array('inline-delimited')),
);
return $form;
diff --git a/plugins/content_types/search/search_form.inc b/plugins/content_types/search/search_form.inc
index 6fd9e41..2ab1fa7 100644
--- a/plugins/content_types/search/search_form.inc
+++ b/plugins/content_types/search/search_form.inc
@@ -121,7 +121,6 @@ function ctools_search_form_content_type_edit_form($form, &$form_state) {
$form['path'] = array(
'#type' => 'textfield',
'#default_value' => $conf['path'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-path-type' => array('custom')),
'#suffix' => '</div>',
);
@@ -136,7 +135,6 @@ function ctools_search_form_content_type_edit_form($form, &$form_state) {
$form['prompt'] = array(
'#type' => 'textfield',
'#default_value' => $conf['prompt'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-prompt' => array(1)),
'#suffix' => '</div>',
);
diff --git a/plugins/content_types/search/search_result.inc b/plugins/content_types/search/search_result.inc
index f491a75..918b6fe 100644
--- a/plugins/content_types/search/search_result.inc
+++ b/plugins/content_types/search/search_result.inc
@@ -116,7 +116,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#title' => t('Title'),
'#type' => 'textfield',
'#default_value' => $conf['empty_title'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-empty' => array(1)),
);
@@ -124,7 +123,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#title' => t('No result text'),
'#type' => 'textarea',
'#default_value' => $conf['empty'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-empty' => array(1)),
);
@@ -132,7 +130,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#type' => 'hidden',
'#id' => 'edit-empty-format',
'#prefix' => '<div><fieldset id="edit-empty-format" class="collapsed collapsible"><legend>' . t('Input format') . '</legend>',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-empty' => array(1)),
);
// Yes, lots of gymnastics to make this fieldset work with dependencies.
@@ -154,7 +151,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#title' => t('Title'),
'#type' => 'textfield',
'#default_value' => $conf['no_key_title'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-no-key' => array(1)),
);
@@ -162,7 +158,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#title' => t('No keywords text'),
'#type' => 'textarea',
'#default_value' => $conf['no_key'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-no-key' => array(1)),
);
@@ -170,7 +165,6 @@ function ctools_search_result_content_type_edit_form($form, &$form_state) {
'#type' => 'hidden',
'#id' => 'edit-no-key-format',
'#prefix' => '<div><fieldset id="edit-no-key-format" class="collapsed collapsible"><legend>' . t('Input format') . '</legend>',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('edit-override-no-key' => array(1)),
);
// Yes, lots of gymnastics to make this fieldset work with dependencies.
diff --git a/plugins/contexts/term.inc b/plugins/contexts/term.inc
index 3c791d2..1d6d48e 100644
--- a/plugins/contexts/term.inc
+++ b/plugins/contexts/term.inc
@@ -90,7 +90,6 @@ function ctools_context_term_settings_form($form, &$form_state) {
'#type' => 'textfield',
'#description' => t('Select a term from @vocabulary.', array('@vocabulary' => $vocabulary->name)) . $description,
'#autocomplete_path' => 'taxonomy/autocomplete/' . $vocabulary->vid,
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('ctools-select-vid' => array($vocabulary->vid)),
);
diff --git a/plugins/contexts/user.inc b/plugins/contexts/user.inc
index 7104156..638d146 100644
--- a/plugins/contexts/user.inc
+++ b/plugins/contexts/user.inc
@@ -82,7 +82,6 @@ function ctools_context_user_settings_form($form, &$form_state) {
'#type' => 'textfield',
'#maxlength' => 512,
'#autocomplete_path' => 'user/autocomplete',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:type' => array('select')),
);
@@ -103,7 +102,6 @@ function ctools_context_user_settings_form($form, &$form_state) {
'#default_value' => FALSE,
'#title' => t('Reset identifier to username'),
'#description' => t('If checked, the identifier will be reset to the user name of the selected user.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('radio:context[context_settings][type]' => array('select')),
);
diff --git a/views_content/plugins/content_types/views.inc b/views_content/plugins/content_types/views.inc
index c3e476f..9c60b9e 100644
--- a/views_content/plugins/content_types/views.inc
+++ b/views_content/plugins/content_types/views.inc
@@ -335,7 +335,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) {
'#title' => t('Use pager'),
'#default_value' => $conf['use_pager'],
'#id' => 'use-pager-checkbox',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('override-pager-checkbox' => array(1)),
);
$form['pager_settings']['pager_id'] = array(
@@ -344,7 +343,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) {
'#title' => t('Pager ID'),
'#size' => 4,
'#id' => 'use-pager-textfield',
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('override-pager-checkbox' => array(1), 'use-pager-checkbox' => array(1)),
'#dependency_count' => 2,
'#suffix' => '</div>',
@@ -355,7 +353,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) {
'#default_value' => $conf['nodes_per_page'],
'#size' => 4,
'#title' => t('Num posts'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('override-pager-checkbox' => array(1)),
);
@@ -365,7 +362,6 @@ function views_content_views_content_type_edit_form($form, &$form_state) {
'#title' => t('Offset'),
'#size' => 4,
'#description' => t('The number of items to skip and not display.'),
- '#process' => array('ctools_dependent_process'),
'#dependency' => array('override-pager-checkbox' => array(1)),
);
diff --git a/views_content/plugins/content_types/views_row.inc b/views_content/plugins/content_types/views_row.inc
index 91c51b3..827d360 100644
--- a/views_content/plugins/content_types/views_row.inc
+++ b/views_content/plugins/content_types/views_row.inc
@@ -144,7 +144,6 @@ function views_content_views_row_edit($form, &$form_state) {
'#default_value' => $conf['fields'],
'#prefix' => '<div id="edit-fields-wrapper"><div id="edit-fields">',
'#suffix' => '</div></div>',
- '#process' => array('ctools_dependent_process', 'form_process_radios'),
'#dependency' => array('edit-use-fields' => array(TRUE)),
);
}
diff --git a/views_content/plugins/views/views_content_plugin_display_ctools_context.inc b/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
index 5a3638b..2f084e3 100644
--- a/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
+++ b/views_content/plugins/views/views_content_plugin_display_ctools_context.inc
@@ -194,7 +194,6 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
'#description' => t('If "From context" is selected, which type of context to use.'),
'#default_value' => $argument['context'],
'#options' => ctools_context_get_all_converters(),
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array($type_id => array('context')),
);
@@ -203,7 +202,6 @@ class views_content_plugin_display_ctools_context extends views_plugin_display {
'#title' => t('Context is optional'),
'#description' => t('This context need not be present for the pane to function. If you plan to use this, ensure that the argument handler can handle empty values gracefully.'),
'#default_value' => $argument['context_optional'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array($type_id => array('context')),
);
}
diff --git a/views_content/plugins/views/views_content_plugin_display_panel_pane.inc b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
index 6e36a8a..e408292 100644
--- a/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
+++ b/views_content/plugins/views/views_content_plugin_display_panel_pane.inc
@@ -272,7 +272,6 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#description' => t('If "From context" is selected, which type of context to use.'),
'#default_value' => $argument['context'],
'#options' => ctools_context_get_all_converters(),
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array($type_id => array('context')),
);
@@ -281,7 +280,6 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#title' => t('Context is optional'),
'#description' => t('This context need not be present for the pane to function. If you plan to use this, ensure that the argument handler can handle empty values gracefully.'),
'#default_value' => $argument['context_optional'],
- '#process' => array('form_process_checkbox', 'ctools_dependent_process'),
'#dependency' => array($type_id => array('context')),
);
@@ -291,7 +289,6 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#description' => t('If "From panel argument" is selected, which panel argument to use.'),
'#default_value' => $argument['panel'],
'#options' => array(0 => t('First'), 1 => t('Second'), 2 => t('Third'), 3 => t('Fourth'), 4 => t('Fifth'), 5 => t('Sixth')),
- '#process' => array('form_process_select', 'ctools_dependent_process'),
'#dependency' => array($type_id => array('panel')),
);
@@ -300,7 +297,6 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#title' => t('Fixed argument'),
'#description' => t('If "Fixed" is selected, what to use as an argument.'),
'#default_value' => $argument['fixed'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($type_id => array('fixed')),
);
@@ -309,7 +305,6 @@ class views_content_plugin_display_panel_pane extends views_plugin_display {
'#title' => t('Label'),
'#description' => t('If this argument is presented to the panels user, what label to apply to it.'),
'#default_value' => empty($argument['label']) ? $argument['name'] : $argument['label'],
- '#process' => array('ctools_dependent_process'),
'#dependency' => array($type_id => array('user')),
);
}