--- nodequeue.module 31 Aug 2009 14:14:36 -0000 1.1.6.6 +++ nodequeue.module 3 Nov 2009 07:28:43 -0000 @@ -1026,7 +1026,7 @@ function _nodequeue_dragdrop_get_nodes($ $visible = nodequeue_nids_visible($subqueue->sqid); // get a list of all nodes in the subqueue, regardless of access restrictions - $result = db_query('SELECT DISTINCT(n.nid), n.title, n.uid, u.name, n.created, nq.position FROM {node} n LEFT JOIN {users} u on n.uid = u.uid LEFT JOIN {nodequeue_nodes} nq ON nq.nid = n.nid WHERE nq.sqid = %d ORDER BY nq.position '. $order, $subqueue->sqid); + $result = db_query('SELECT DISTINCT(n.nid), n.language, n.title, n.uid, u.name, n.created, nq.position FROM {node} n LEFT JOIN {users} u on n.uid = u.uid LEFT JOIN {nodequeue_nodes} nq ON nq.nid = n.nid WHERE nq.sqid = %d ORDER BY nq.position '. $order, $subqueue->sqid); $nodes = array(); while ($node = db_fetch_object($result)) { @@ -1052,12 +1052,13 @@ function nodequeue_arrange_subqueue_form foreach ($nodes as $node) { $form[$node->nid]['#node'] = (array) $node; if ($node->visible) { - $form[$node->nid]['#node'] = (array) $node; + $form[$node->nid]['language'] = array('#value' => l($node->language, 'node/'. $node->nid)); $form[$node->nid]['title'] = array('#value' => l($node->title, 'node/'. $node->nid)); $form[$node->nid]['author'] = array('#value' => theme('username', $node)); $form[$node->nid]['date'] = array('#value' => format_date($node->created, 'small')); } else { + $form[$node->nid]['language'] = array('#value' => $node->language); $form[$node->nid]['title'] = array('#value' => t('Restricted node, NID: @nid', array('@nid' => $node->nid))); $form[$node->nid]['author'] = array('#value' => ''); $form[$node->nid]['date'] = array('#value' => ''); @@ -2729,6 +2730,7 @@ function theme_nodequeue_arrange_subqueu if (isset($form[$key]['title'])) { $row = array(); + $row[] = drupal_render($form[$key]['language']); $row[] = drupal_render($form[$key]['title']); $row[] = drupal_render($form[$key]['author']); $row[] = drupal_render($form[$key]['date']); @@ -2753,7 +2755,7 @@ function theme_nodequeue_arrange_subqueu } // render the main nodequeue table - $header = array(t('Title'), t('Author'), t('Post Date'), t('Position'), array('data' => t('Operations'), 'colspan' => 2), t('Position')); + $header = array(t('Language'), t('Title'), t('Author'), t('Post Date'), t('Position'), array('data' => t('Operations'), 'colspan' => 2), t('Position')); $output .= theme('table', $header, $rows, array('id' => 'nodequeue-dragdrop', 'class' => 'nodequeue-dragdrop')); // render the autocomplete field for adding a node to the table