diff -upr /tmp/nodequeue/includes/views/nodequeue_handler_field_all_queues.inc ./includes/views/nodequeue_handler_field_all_queues.inc --- /tmp/nodequeue/includes/views/nodequeue_handler_field_all_queues.inc 2010-10-07 03:50:35.000000000 +0100 +++ ./includes/views/nodequeue_handler_field_all_queues.inc 2010-12-10 11:27:41.329183851 +0000 @@ -34,7 +34,7 @@ class nodequeue_handler_field_all_queues ); $options = array(); - $queues = nodequeue_load_queues(nodequeue_get_all_qids(NULL)); + $queues = nodequeue_load_queues(nodequeue_get_all_qids()); foreach ($queues as $queue) { $options[$queue->qid] = $queue->title; } @@ -46,8 +46,11 @@ class nodequeue_handler_field_all_queues '#title' => t('Queues'), '#options' => $options, '#default_value' => $this->options['qids'], - '#process' => array('expand_checkboxes', 'views_process_dependency'), - '#dependency' => array('edit-options-limit' => array(TRUE)), + '#states' => array( + 'visible' => array( + ':input[name="options[limit]"]' => array('checked' => TRUE) + ), + ), ); } diff -upr /tmp/nodequeue/includes/views/nodequeue_handler_filter_in_queue.inc ./includes/views/nodequeue_handler_filter_in_queue.inc --- /tmp/nodequeue/includes/views/nodequeue_handler_filter_in_queue.inc 2008-09-06 16:42:05.000000000 +0100 +++ ./includes/views/nodequeue_handler_filter_in_queue.inc 2010-12-10 11:57:34.777214249 +0000 @@ -6,6 +6,6 @@ class nodequeue_handler_filter_in_queue extends views_handler_filter_boolean_operator { function query() { $this->ensure_my_table(); - $this->query->add_where($this->options['group'], "$this->table_alias.nid " . ($this->value ? '<> 0' : 'IS NULL')); + $this->query->add_where($this->options['group'], $this->table_alias . ".nid", $this->value, ($this->value ? '!=' : 'IS NULL')); } } diff -upr /tmp/nodequeue/includes/views/nodequeue_handler_relationship_nodequeue.inc ./includes/views/nodequeue_handler_relationship_nodequeue.inc --- /tmp/nodequeue/includes/views/nodequeue_handler_relationship_nodequeue.inc 2010-10-07 03:50:35.000000000 +0100 +++ ./includes/views/nodequeue_handler_relationship_nodequeue.inc 2010-12-10 11:27:41.329183851 +0000 @@ -19,7 +19,7 @@ class nodequeue_handler_relationship_nod function options_form(&$form, &$form_state) { parent::options_form($form, $form_state); - $queues = nodequeue_load_queues(nodequeue_get_all_qids(NULL)); + $queues = nodequeue_load_queues(nodequeue_get_all_qids()); $form['limit'] = array( '#type' => 'checkbox', @@ -28,20 +28,21 @@ class nodequeue_handler_relationship_nod ); $options = array(); - $queues = nodequeue_load_queues(nodequeue_get_all_qids(NULL)); + foreach ($queues as $queue) { $options[$queue->qid] = $queue->title; } $form['qids'] = array( - '#prefix' => '
', - '#suffix' => '
', '#type' => 'checkboxes', '#title' => t('Queues'), '#options' => $options, '#default_value' => $this->options['qids'], - '#process' => array('expand_checkboxes', 'views_process_dependency'), - '#dependency' => array('edit-options-limit' => array(TRUE)), + '#states' => array( + 'visible' => array( + ':input[name="options[limit]"]' => array('checked' => TRUE) + ), + ), ); } diff -upr /tmp/nodequeue/includes/views/nodequeue.views_default.inc ./includes/views/nodequeue.views_default.inc --- /tmp/nodequeue/includes/views/nodequeue.views_default.inc 2010-10-07 03:50:35.000000000 +0100 +++ ./includes/views/nodequeue.views_default.inc 2010-12-10 11:27:41.329183851 +0000 @@ -13,7 +13,7 @@ function nodequeue_views_default_views() return $views; } - $queues = nodequeue_load_queues(nodequeue_get_all_qids(NULL)); + $queues = nodequeue_load_queues(nodequeue_get_all_qids()); foreach ($queues as $queue) { $view = new view; $view->name = "nodequeue_$queue->qid"; diff -upr /tmp/nodequeue/includes/views/nodequeue.views.inc ./includes/views/nodequeue.views.inc --- /tmp/nodequeue/includes/views/nodequeue.views.inc 2010-10-07 03:50:35.000000000 +0100 +++ ./includes/views/nodequeue.views.inc 2010-12-10 11:27:41.329183851 +0000 @@ -16,38 +16,6 @@ * really quite simple. */ - - -function nodequeue_views_handlers() { - return array( - 'info' => array( - 'path' => drupal_get_path('module', 'nodequeue') . '/includes/views', - ), - 'handlers' => array( - 'nodequeue_handler_argument_subqueue_qid' => array( - 'parent' => 'views_handler_filter_numeric', - ), - 'nodequeue_handler_field_all_queues' => array( - 'parent' => 'views_handler_field_prerender_list', - ), - 'nodequeue_handler_field_all_subqueues' => array( - 'parent' => 'nodequeue_handler_field_all_queues', - ), - 'nodequeue_handler_field_links' => array( - 'parent' => 'views_handler_field_node_link', - ), - 'nodequeue_handler_field_queue_tab' => array( - 'parent' => 'views_handler_field_node_link', - ), - 'nodequeue_handler_filter_in_queue' => array( - 'parent' => 'views_handler_filter_boolean_operator', - ), - 'nodequeue_handler_relationship_nodequeue' => array( - 'parent' => 'views_handler_relationship', - ), - ), - ); -} /** * Implements hook_views_data(). */ diff -upr /tmp/nodequeue/nodequeue.info ./nodequeue.info --- /tmp/nodequeue/nodequeue.info 2010-10-07 13:14:24.000000000 +0100 +++ ./nodequeue.info 2010-12-10 11:58:14.697212321 +0000 @@ -4,7 +4,17 @@ description = Create queues which can co package = Nodequeue core = 7.x files[] = nodequeue.module - +; Views Handlers +files[] = includes/views/nodequeue_handler_argument_subqueue_qid.inc +files[] = includes/views/nodequeue_handler_field_all_queues.inc +files[] = includes/views/nodequeue_handler_field_all_subqueues.inc +files[] = includes/views/nodequeue_handler_field_links.inc +files[] = includes/views/nodequeue_handler_field_queue_tab.inc +files[] = includes/views/nodequeue_handler_filter_in_queue.inc +files[] = includes/views/nodequeue_handler_relationship_nodequeue.inc +; Includes +files[] = includes/views/nodequeue.views.inc +files[] = includes/nodequeue.actions.inc ; Information added by drupal.org packaging script on 2010-10-07 version = "7.x-2.x-dev" diff -upr /tmp/nodequeue/nodequeue.module ./nodequeue.module --- /tmp/nodequeue/nodequeue.module 2010-10-07 03:50:35.000000000 +0100 +++ ./nodequeue.module 2010-12-10 11:27:41.329183851 +0000 @@ -1124,8 +1124,9 @@ function nodequeue_arrange_subqueue_form 'class' => array('nodequeue-remove'), 'id' => 'nodequeue-remove-' . $node->nid, ), + 'query' => nodequeue_get_query_string($node->nid, TRUE), ); - $form['nodes'][$node->nid]['remove'] = array('#markup' => l(t('remove'), '', $attr)); + $form['nodes'][$node->nid]['remove'] = array('#markup' => l(t('remove'), 'admin/structure/nodequeue/' . $queue->qid . '/remove-node/' . $subqueue->sqid . '/' . $node->nid, $attr)); } // add a textfield for adding nodes to the queue @@ -2377,7 +2378,7 @@ function nodequeue_queue_back($subqueue, function nodequeue_get_subqueue_position($sqid, $nid) { // We use MIN to make sure we always get the closes to the front of the // queue in case the queue has nodes in it multiple times. - $pos = db_query("SELECT MIN(position) FROM {nodequeue_nodes} WHERE sqid = %d AND nid = %d", $sqid, $nid)->fetchField(); + $pos = db_query("SELECT MIN(position) FROM {nodequeue_nodes} WHERE sqid = :sqid AND nid = :nid", array(':sqid' => $sqid, ':nid' => $nid))->fetchField(); return $pos; }