? PATCHES.txt
? nodequeue-941558-16.patch
Index: nodequeue.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.info,v
retrieving revision 1.8
diff -u -p -r1.8 nodequeue.info
--- nodequeue.info	7 Oct 2010 02:50:35 -0000	1.8
+++ nodequeue.info	10 Nov 2010 14:15:33 -0000
@@ -4,4 +4,14 @@ 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
Index: nodequeue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v
retrieving revision 1.108
diff -u -p -r1.108 nodequeue.module
--- nodequeue.module	7 Oct 2010 02:50:35 -0000	1.108
+++ nodequeue.module	10 Nov 2010 14:15:33 -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;
 }
 
Index: includes/views/nodequeue.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/includes/views/nodequeue.views.inc,v
retrieving revision 1.5
diff -u -p -r1.5 nodequeue.views.inc
--- includes/views/nodequeue.views.inc	7 Oct 2010 02:50:35 -0000	1.5
+++ includes/views/nodequeue.views.inc	10 Nov 2010 14:15:34 -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().
  */
Index: includes/views/nodequeue.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/includes/views/nodequeue.views_default.inc,v
retrieving revision 1.6
diff -u -p -r1.6 nodequeue.views_default.inc
--- includes/views/nodequeue.views_default.inc	7 Oct 2010 02:50:35 -0000	1.6
+++ includes/views/nodequeue.views_default.inc	10 Nov 2010 14:15:34 -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";
Index: includes/views/nodequeue_handler_field_all_queues.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/includes/views/nodequeue_handler_field_all_queues.inc,v
retrieving revision 1.2
diff -u -p -r1.2 nodequeue_handler_field_all_queues.inc
--- includes/views/nodequeue_handler_field_all_queues.inc	7 Oct 2010 02:50:35 -0000	1.2
+++ includes/views/nodequeue_handler_field_all_queues.inc	10 Nov 2010 14:15:34 -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)
+        ),
+      ),
     );
   }
 
Index: includes/views/nodequeue_handler_relationship_nodequeue.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/includes/views/nodequeue_handler_relationship_nodequeue.inc,v
retrieving revision 1.3
diff -u -p -r1.3 nodequeue_handler_relationship_nodequeue.inc
--- includes/views/nodequeue_handler_relationship_nodequeue.inc	7 Oct 2010 02:50:35 -0000	1.3
+++ includes/views/nodequeue_handler_relationship_nodequeue.inc	10 Nov 2010 14:15:34 -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' => '<div><div id="edit-options-qids">',
-      '#suffix' => '</div></div>',
       '#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)
+        ),
+      ),
     );
   }