From e8cb14b5c23a77181b1b4a27ee3b37e183d0989c Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Wed, 6 May 2009 00:48:52 +0000
Subject: [PATCH] #429938: Make delegator not override a page if some other
module has already done so.
---
delegator/delegator.admin.inc | 4 ++
delegator/delegator.install | 7 ++++
delegator/plugins/tasks/node_edit.inc | 21 +++++++++--
delegator/plugins/tasks/node_view.inc | 54 ++++++++++++++++-----------
delegator/plugins/tasks/term_view.inc | 25 +++++++++++--
delegator/plugins/tasks/user_view.inc | 53 ++++++++++++++++----------
6 files changed, 117 insertions(+), 47 deletions(-)
diff --git a/delegator/delegator.admin.inc b/delegator/delegator.admin.inc
index c8de2557..c1736052 100644
--- a/delegator/delegator.admin.inc
+++ b/delegator/delegator.admin.inc
@@ -497,6 +497,10 @@ function delegator_admin_list_form(&$form_state) {
'export' => 'delegator_admin_list_form_action_export',
);
+ if ($function = ctools_plugin_get_function($task, 'task admin')) {
+ $function($form, $form_state);
+ }
+
return $form;
}
diff --git a/delegator/delegator.install b/delegator/delegator.install
index d650bfca..e70c018b 100644
--- a/delegator/delegator.install
+++ b/delegator/delegator.install
@@ -187,6 +187,7 @@ function delegator_schema_1() {
*/
function delegator_install() {
drupal_install_schema('delegator');
+ db_query("UPDATE {system} SET weight = 99 WHERE name = 'delegator'");
}
/**
@@ -238,3 +239,9 @@ function delegator_update_6101() {
return $ret;
}
+
+function delegator_update_6102() {
+ $ret = array();
+ $ret[] = update_sql("UPDATE {system} SET weight = 99 WHERE name = 'delegator'");
+ return $ret;
+}
diff --git a/delegator/plugins/tasks/node_edit.inc b/delegator/plugins/tasks/node_edit.inc
index 83b94f44..cb4e0fcf 100644
--- a/delegator/plugins/tasks/node_edit.inc
+++ b/delegator/plugins/tasks/node_edit.inc
@@ -16,6 +16,9 @@ function delegator_node_edit_delegator_tasks() {
'admin description' => 'Overrides for the built in node edit handler at <em>node/%node/edit</em>.',
'admin path' => 'node/%node/edit',
+ // Callback to add items to the delegator task administration form:
+ 'task admin' => 'delegator_node_edit_task_admin',
+
// Menu hooks so that we can alter the node/%node menu entry to point to us.
'hook menu' => 'delegator_node_edit_menu',
'hook menu alter' => 'delegator_node_edit_menu_alter',
@@ -36,9 +39,11 @@ function delegator_node_edit_delegator_tasks() {
*/
function delegator_node_edit_menu_alter(&$items, $task) {
// Override the node edit handler for our purpose.
- $items['node/%node/edit']['page callback'] = 'delegator_node_edit';
- $items['node/%node/edit']['file path'] = $task['path'];
- $items['node/%node/edit']['file'] = $task['file'];
+ if ($items['node/%node/edit']['page callback'] == 'node_page_edit' || variable_get('delegator_override_anyway', FALSE)) {
+ $items['node/%node/edit']['page callback'] = 'delegator_node_edit';
+ $items['node/%node/edit']['file path'] = $task['path'];
+ $items['node/%node/edit']['file'] = $task['file'];
+ }
// Also catch node/add handling:
foreach (node_get_types('types', NULL, TRUE) as $type) {
@@ -55,6 +60,16 @@ function delegator_node_edit_menu_alter(&$items, $task) {
}
}
+/**
+ * Warn if we are unable to override the taxonomy term page.
+ */
+function delegator_node_edit_task_admin(&$form, &$form_state) {
+ $callback = db_result(db_query("SELECT page_callback FROM {menu_router} WHERE path = 'node/%/edit'"));
+ if ($callback != 'delegator_node_edit') {
+ drupal_set_message(t('Delegator module is unable to override node/%node/edit because some other module already has overridden with %callback. Delegator will not be able to handle this page.', array('%callback' => $callback)), 'warning');
+ }
+}
+
/**
* Entry point for our overridden node edit.
*
diff --git a/delegator/plugins/tasks/node_view.inc b/delegator/plugins/tasks/node_view.inc
index 4ec25dae..8094f571 100644
--- a/delegator/plugins/tasks/node_view.inc
+++ b/delegator/plugins/tasks/node_view.inc
@@ -16,26 +16,27 @@
*/
function delegator_node_view_delegator_tasks() {
return array(
- 'node_view' => array(
- // This is a 'page' task and will fall under the page admin UI
- 'task type' => 'page',
+ // This is a 'page' task and will fall under the page admin UI
+ 'task type' => 'page',
- 'title' => t('Node view'),
- 'description' => t('The node view task allows you to control what handler will handle the job of rendering a node view at the path <em>node/%node</em>. If no handler is set or matches the criteria, the default Drupal node renderer will be used.'),
- 'admin title' => 'Node view', // translated by menu system
- 'admin description' => 'Overrides for the built in node view handler at <em>node/%node</em>.',
- 'admin path' => 'node/%node',
+ 'title' => t('Node view'),
+ 'description' => t('The node view task allows you to control what handler will handle the job of rendering a node view at the path <em>node/%node</em>. If no handler is set or matches the criteria, the default Drupal node renderer will be used.'),
+ 'admin title' => 'Node view', // translated by menu system
+ 'admin description' => 'Overrides for the built in node view handler at <em>node/%node</em>.',
+ 'admin path' => 'node/%node',
- // Menu hooks so that we can alter the node/%node menu entry to point to us.
- 'hook menu' => 'delegator_node_view_menu',
- 'hook menu alter' => 'delegator_node_view_menu_alter',
+ // Callback to add items to the delegator task administration form:
+ 'task admin' => 'delegator_node_view_task_admin',
- // This is task uses 'context' handlers and must implement these to give the
- // handler data it needs.
- 'handler type' => 'context',
- 'get arguments' => 'delegator_node_view_get_arguments',
- 'get context placeholders' => 'delegator_node_view_get_contexts',
- ),
+ // Menu hooks so that we can alter the node/%node menu entry to point to us.
+ 'hook menu' => 'delegator_node_view_menu',
+ 'hook menu alter' => 'delegator_node_view_menu_alter',
+
+ // This is task uses 'context' handlers and must implement these to give the
+ // handler data it needs.
+ 'handler type' => 'context',
+ 'get arguments' => 'delegator_node_view_get_arguments',
+ 'get context placeholders' => 'delegator_node_view_get_contexts',
);
}
@@ -47,13 +48,24 @@ function delegator_node_view_delegator_tasks() {
*/
function delegator_node_view_menu_alter(&$items, $task) {
// Override the node view handler for our purpose.
- $items['node/%node']['page callback'] = 'delegator_node_view';
- $items['node/%node']['file path'] = $task['path'];
- $items['node/%node']['file'] = $task['file'];
-
+ if ($items['node/%node']['page callback'] == 'node_page_view' || variable_get('delegator_override_anyway', FALSE)) {
+ $items['node/%node']['page callback'] = 'delegator_node_view';
+ $items['node/%node']['file path'] = $task['path'];
+ $items['node/%node']['file'] = $task['file'];
+ }
// @todo override node revision handler as well?
}
+/**
+ * Warn if we are unable to override the taxonomy term page.
+ */
+function delegator_node_view_task_admin(&$form, &$form_state) {
+ $callback = db_result(db_query("SELECT page_callback FROM {menu_router} WHERE path = 'node/%'"));
+ if ($callback != 'delegator_node_view') {
+ drupal_set_message(t('Delegator module is unable to override node/%node because some other module already has overridden with %callback. Delegator will not be able to handle this page.', array('%callback' => $callback)), 'warning');
+ }
+}
+
/**
* Entry point for our overridden node view.
*
diff --git a/delegator/plugins/tasks/term_view.inc b/delegator/plugins/tasks/term_view.inc
index 7aa57b14..df7ec565 100644
--- a/delegator/plugins/tasks/term_view.inc
+++ b/delegator/plugins/tasks/term_view.inc
@@ -32,6 +32,9 @@ function delegator_term_view_delegator_tasks() {
// Provide a setting to the primary settings UI for Panels
'admin settings' => 'delegator_term_view_admin_settings',
+ // Callback to add items to the delegator task administration form:
+ 'task admin' => 'delegator_term_view_task_admin',
+
// This is task uses 'context' handlers and must implement these to give the
// handler data it needs.
'handler type' => 'context',
@@ -73,10 +76,23 @@ function delegator_term_view_menu(&$items, $task) {
* normal term view process.
*/
function delegator_term_view_menu_alter(&$items, $task) {
- // Override the term view handler for our purpose.
- $items['taxonomy/term/%']['page callback'] = 'delegator_term_view';
- $items['taxonomy/term/%']['file path'] = $task['path'];
- $items['taxonomy/term/%']['file'] = $task['file'];
+ // Override the term view handler for our purpose, but only if someone else
+ // has not already done so.
+ if ($items['taxonomy/term/%']['page callback'] == 'taxonomy_term_page' || variable_get('delegator_override_anyway', FALSE)) {
+ $items['taxonomy/term/%']['page callback'] = 'delegator_term_view';
+ $items['taxonomy/term/%']['file path'] = $task['path'];
+ $items['taxonomy/term/%']['file'] = $task['file'];
+ }
+}
+
+/**
+ * Warn if we are unable to override the taxonomy term page.
+ */
+function delegator_term_view_task_admin(&$form, &$form_state) {
+ $callback = db_result(db_query("SELECT page_callback FROM {menu_router} WHERE path = 'taxonomy/term/%'"));
+ if ($callback != 'delegator_term_view') {
+ drupal_set_message(t('Delegator module is unable to override taxonomy/term/% because some other module already has overridden with %callback. Delegator will not be able to handle this page.', array('%callback' => $callback)), 'warning');
+ }
}
/**
@@ -179,3 +195,4 @@ function delegator_term_view_admin_settings(&$form) {
'#default_value' => variable_get('delegator_term_view_type', 'multiple'),
);
}
+
diff --git a/delegator/plugins/tasks/user_view.inc b/delegator/plugins/tasks/user_view.inc
index 0dab03bf..83f90454 100644
--- a/delegator/plugins/tasks/user_view.inc
+++ b/delegator/plugins/tasks/user_view.inc
@@ -7,22 +7,25 @@
*/
function delegator_user_view_delegator_tasks() {
return array(
- 'user_view' => array(
- // This is a 'page' task and will fall under the page admin UI
- 'task type' => 'page',
- 'title' => t('User view'),
- 'description' => t('The user view task allows you to control which modules serve requests made to user/%. By default, the core user module will show the user account page. The first task that matches the user will be used to display the user. If no task handlers exist, or if none of the existing task handlers are configured to handle the currently requested user, then the request falls back to the default Drupal user view mechanism.'),
- 'admin title' => 'User view', // translated by menu system
- 'admin description' => 'Overrides for the built in user handler, allowing customized user output.',
- 'admin path' => 'user/%user',
- 'hook menu' => 'delegator_user_view_menu',
- 'hook menu alter' => 'delegator_user_view_menu_alter',
- // This is task uses 'context' handlers and must implement these to give the
- // handler data it needs.
- 'handler type' => 'context', // handler type -- misnamed
- 'get arguments' => 'delegator_user_view_get_arguments',
- 'get context placeholders' => 'delegator_user_view_get_contexts',
- ),
+ // This is a 'page' task and will fall under the page admin UI
+ 'task type' => 'page',
+ 'title' => t('User view'),
+ 'description' => t('The user view task allows you to control which modules serve requests made to user/%. By default, the core user module will show the user account page. The first task that matches the user will be used to display the user. If no task handlers exist, or if none of the existing task handlers are configured to handle the currently requested user, then the request falls back to the default Drupal user view mechanism.'),
+ 'admin title' => 'User view', // translated by menu system
+ 'admin description' => 'Overrides for the built in user handler, allowing customized user output.',
+ 'admin path' => 'user/%user',
+
+ // Callback to add items to the delegator task administration form:
+ 'task admin' => 'delegator_term_view_task_admin',
+
+ 'hook menu' => 'delegator_user_view_menu',
+ 'hook menu alter' => 'delegator_user_view_menu_alter',
+
+ // This is task uses 'context' handlers and must implement these to give the
+ // handler data it needs.
+ 'handler type' => 'context', // handler type -- misnamed
+ 'get arguments' => 'delegator_user_view_get_arguments',
+ 'get context placeholders' => 'delegator_user_view_get_contexts',
);
}
@@ -34,9 +37,21 @@ function delegator_user_view_delegator_tasks() {
*/
function delegator_user_view_menu_alter(&$items, $task) {
// Override the user view handler for our purpose.
- $items['user/%user_uid_optional']['page callback'] = 'delegator_user_view';
- $items['user/%user_uid_optional']['file path'] = $task['path'];
- $items['user/%user_uid_optional']['file'] = $task['file'];
+ if ($items['user/%user_uid_optional']['page callback'] == 'user_view' || variable_get('delegator_override_anyway', FALSE)) {
+ $items['user/%user_uid_optional']['page callback'] = 'delegator_user_view';
+ $items['user/%user_uid_optional']['file path'] = $task['path'];
+ $items['user/%user_uid_optional']['file'] = $task['file'];
+ }
+}
+
+/**
+ * Warn if we are unable to override the taxonomy term page.
+ */
+function delegator_user_view_task_admin(&$form, &$form_state) {
+ $callback = db_result(db_query("SELECT page_callback FROM {menu_router} WHERE path = 'user/%'"));
+ if ($callback != 'delegator_user_view') {
+ drupal_set_message(t('Delegator module is unable to override user/%user because some other module already has overridden with %callback. Delegator will not be able to handle this page.', array('%callback' => $callback)), 'warning');
+ }
}
/**
--
GitLab