From 508d5476f5b87b42f92c21c08b1c56de916f738a Mon Sep 17 00:00:00 2001
From: Earl Miles <merlin@logrus.com>
Date: Thu, 30 Apr 2009 21:51:41 +0000
Subject: [PATCH] Fix some problems with default task handlers and cloning task
handlers.
---
delegator/delegator.admin.inc | 5 ++++-
delegator/delegator.module | 5 +++++
includes/context.inc | 9 ++++++---
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/delegator/delegator.admin.inc b/delegator/delegator.admin.inc
index 43332969..c8de2557 100644
--- a/delegator/delegator.admin.inc
+++ b/delegator/delegator.admin.inc
@@ -780,7 +780,7 @@ function delegator_admin_list_form_submit($form, &$form_state) {
// @todo -- do we need to clear the handler weight here?
}
// Otherwise, check to see if it has moved and, if so, update the weight.
- elseif ($info['weight'] != $form_state['task_handlers'][$id]->weight) {
+ elseif ($info['weight'] != isset($form_state['task_handlers']) && $form_state['task_handlers'][$id]->weight) {
// Theoretically we could only do this for in code objects, but since our
// load mechanism checks for all, this is less database work.
delegator_update_task_handler_weight($form_state['task_handlers'][$id], $info['weight']);
@@ -894,6 +894,9 @@ function delegator_admin_list_form_action_clone($form, &$form_state, $id, $actio
// Get the next weight from the form
$handler->weight = delegator_admin_update_weights($form_state);
+ $handler->export_type = EXPORT_IN_DATABASE;
+ $handler->type = t('Normal');
+
// Generate a unique name. Unlike most named objects, we don't let people choose
// names for task handlers because they mostly don't make sense.
$base = $form_state['task']['name'];
diff --git a/delegator/delegator.module b/delegator/delegator.module
index 46a92d61..8a1fe8e5 100644
--- a/delegator/delegator.module
+++ b/delegator/delegator.module
@@ -263,8 +263,13 @@ function delegator_load_task_handlers($task, $subtask_id = NULL, $default_handle
$defaults = isset($default_handlers) ? $default_handlers : delegator_get_default_task_handlers($task, $subtask_id);
foreach ($defaults as $name => $default) {
$result = delegator_compare_task_handlers($handlers, $defaults, $name);
+
if ($result) {
$handlers[$name] = $result;
+ // Ensure task and subtask are correct, because it's easy to change task
+ // names when editing a default and fail to do it on the associated handlers.
+ $result->task = $task['name'];
+ $result->subtask = $subtask_id;
}
}
diff --git a/includes/context.inc b/includes/context.inc
index 3348c5e8..a2b329cb 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -160,8 +160,8 @@ class ctools_context_required {
// Due to a bug, some contexts got recorded with an id of 0. This will
// convert them to the correct ID allowing for some earlier panels
// to continue to work.
- if (!empty($context) && $context[strlen($context) - 1] == 0) {
- $context[strlen($context) -1 ] = 1;
+ if (!empty($context) && $context[strlen($context) - 1] === '0') {\
+ $context[strlen($context) - 1] = 1;
}
if (empty($context) || empty($contexts[$context])) {
@@ -601,6 +601,10 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
* are unique in the final list.
*/
function ctools_context_id($context, $type = 'context') {
+ if (!$context['id']) {
+ $context['id'] = 1;
+ }
+
return $type . '_' . $context['name'] . '_' . $context['id'];
}
@@ -616,7 +620,6 @@ function ctools_context_id($context, $type = 'context') {
*/
function ctools_context_next_id($objects, $name) {
// Figure out which instance of this argument we're creating
- $id = 0;
if (!$objects) {
return $id;
}
--
GitLab