diff --git a/delegator/delegator.admin.inc b/delegator/delegator.admin.inc
index a78d45580f70da28322faaba64e6ea3e077e6bf2..22228aaf95a3253feaa4e7d4099798d92132c73a 100644
--- a/delegator/delegator.admin.inc
+++ b/delegator/delegator.admin.inc
@@ -478,7 +478,7 @@ function delegator_admin_list_form_add($form, &$form_state) {
}
// Store the new handler.
- if ($form_state['cache']->locked) {
+ if (!$form_state['cache']->locked) {
delegator_admin_set_task_handler_cache($handler);
}
@@ -538,10 +538,9 @@ function delegator_admin_list_form_submit($form, &$form_state) {
}
// Otherwise, check to see if it has moved and, if so, update the weight.
elseif ($info['weight'] != $form_state['task_handlers'][$id]->weight) {
- // update the weight. Since it could be in the databsae, we'll just
- // write the task handler we have.
- $form_state['task_handlers'][$id]->weight = $info['weight'];
- delegator_save_task_handler($form_state['task_handlers'][$id]);
+ // 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']);
}
}
@@ -702,7 +701,7 @@ function delegator_administer_task_handler_edit($task_name, $handler_id, $name,
/**
* Entry point to add a task handler.
*/
-function delegator_administer_task_handler_add($task_id, $name, $form_id) {
+function delegator_administer_task_handler_add($task_name, $name, $form_id) {
// Determine if the task id came in the form of TASK-SUBTASK or just TASK
if (strpos($task_name, '-') !== FALSE) {
list($task_id, $subtask_id) = explode('-', $task_name, 2);
diff --git a/delegator/delegator.install b/delegator/delegator.install
index 55d29cd6c936fab25f9dc02af84666027b11cce9..a32d6fcbc42f3c70aaec303f9dc0e6a916af3325 100644
--- a/delegator/delegator.install
+++ b/delegator/delegator.install
@@ -68,6 +68,24 @@ function delegator_schema_1() {
),
);
+ $schema['delegator_weights'] = array(
+ 'description' => t('Contains override weights for delegator handlers that are in code.'),
+ 'fields' => array(
+ 'name' => array(
+ 'type' => 'varchar',
+ 'length' => '255',
+ 'description' => t('Unique ID for this task handler. Used to identify it programmatically.'),
+ ),
+ 'weight' => array(
+ 'type' => 'int',
+ 'description' => t('The order in which this handler appears. Lower numbers go first.'),
+ ),
+ ),
+ 'primary key' => array('name'),
+ 'indexes' => array(
+ 'weights' => array('name', 'weight'),
+ ),
+ );
return $schema;
}
diff --git a/delegator/delegator.module b/delegator/delegator.module
index 61f526aa25622d9177e4e9f09be98ef3d28776dd..190dec44eda3350b6cb1bc158a2bf192be8c48b0 100644
--- a/delegator/delegator.module
+++ b/delegator/delegator.module
@@ -203,7 +203,24 @@ function delegator_load_task_handlers($task, $subtask_id = NULL) {
$conditions['subtask'] = $subtask_id;
}
- return ctools_export_load_object('delegator_handlers', 'conditions', $conditions);
+ $handlers = ctools_export_load_object('delegator_handlers', 'conditions', $conditions);
+
+ // Override weights from the weight table.
+ if ($handlers) {
+ $names = array();
+ $placeholders = array();
+ foreach ($handlers as $handler) {
+ $names[] = $handler->name;
+ $placeholders[] = "'%s'";
+ }
+
+ $result = db_query("SELECT name, weight FROM {delegator_weights} WHERE name IN (" . implode(', ', $placeholders) . ")", $names);
+ while ($weight = db_fetch_object($result)) {
+ $handlers[$weight->name]->weight = $weight->weight;
+ }
+ }
+
+ return $handlers;
}
/**
@@ -248,6 +265,7 @@ function delegator_save_task_handler(&$handler) {
}
drupal_write_record('delegator_handlers', $handler, $update);
+ db_query("DELETE FROM {delegator_weights} WHERE name = '%s'", $handler->name);
return $handler;
}
@@ -256,8 +274,19 @@ function delegator_save_task_handler(&$handler) {
*/
function delegator_delete_task_handler($handler) {
db_query("DELETE FROM {delegator_handlers} WHERE name = '%s'", $handler->name);
+ db_query("DELETE FROM {delegator_weights} WHERE name = '%s'", $handler->name);
}
+/**
+ * Set an overidden weight for a task handler.
+ *
+ * We do this so that in-code task handlers don't need to get written
+ * to the database just because they have their weight changed.
+ */
+function delegator_update_task_handler_weight($handler, $weight) {
+ db_query("DELETE FROM {delegator_weights} WHERE name = '%s'", $handler->name);
+ db_query("INSERT INTO {delegator_weights} (name, weight) VALUES ('%s', %d)", $handler->name, $weight);
+}
/**
* Shortcut function to get task plugins.
diff --git a/includes/export.inc b/includes/export.inc
index 90902d7b4d395ac9d8421e5679d6c92878b62a75..e4f279117e54862d87aedf5f9b1e91da33d1340f 100644
--- a/includes/export.inc
+++ b/includes/export.inc
@@ -31,6 +31,16 @@
),
*/
+/**
+ * A bit flag used to let us know if an object is in the database.
+ */
+define('EXPORT_IN_DATABASE', 0x01);
+
+/**
+ * A bit flag used to let us know if an object is a 'default' in code.
+ */
+define('EXPORT_IN_CODE', 0x02);
+
/**
* Load some number of exportable objects.
*
@@ -113,6 +123,8 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
while ($data = db_fetch_object($result)) {
$object = ctools_export_unpack_object($schema, $data, $export['object']);
$object->type = t('Normal');
+ $object->export_type = EXPORT_IN_DATABASE;
+
$cache[$table][$object->{$export['key']}] = $object;
if ($type == 'conditions') {
$return[$object->{$export['key']}] = $object;
@@ -152,12 +164,15 @@ function ctools_export_load_object($table, $type = 'all', $args = array()) {
if (!empty($cache[$table][$object->name])) {
$cache[$table][$object->name]->type = t('Overridden');
+ $cache[$table][$object->name]->export_status |= EXPORT_IN_CODE;
if ($type == 'conditions') {
$return[$object->name] = $cache[$table][$object->name]->type;
}
}
else {
$object->type = t('Default');
+ $object->export_status = EXPORT_IN_CODE;
+ $object->in_code_only = TRUE;
// move the 'display' to the new 'primary' location.
$object->primary = $object->display;
unset($object->display);