Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.445 diff -u -r1.445 book.module --- modules/book/book.module 4 Nov 2007 14:28:35 -0000 1.445 +++ modules/book/book.module 17 Nov 2007 14:23:48 -0000 @@ -143,13 +143,6 @@ 'type' => MENU_CALLBACK, 'file' => 'book.pages.inc', ); - $items['book/js/admin/%node'] = array( - 'page callback' => 'book_admin_js_update', - 'access callback' => '_book_outline_access', - 'access arguments' => array(3), - 'type' => MENU_CALLBACK, - 'file' => 'book.admin.inc', - ); return $items; } Index: modules/book/book.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v retrieving revision 1.5 diff -u -r1.5 book.admin.inc --- modules/book/book.admin.inc 17 Oct 2007 12:34:16 -0000 1.5 +++ modules/book/book.admin.inc 17 Nov 2007 14:23:48 -0000 @@ -70,61 +70,57 @@ */ function book_admin_edit($form_state, $node) { drupal_set_title(check_plain($node->title)); - $form = array( - '#cache' => TRUE, - '#prefix' => '
', - '#suffix' => '
', - ); - + $form = array(); $form['#node'] = $node; $form['table'] = _book_admin_table($node); $form['save'] = array( '#type' => 'submit', '#value' => t('Save book pages'), - '#ahah' => array( - 'path' => 'book/js/admin/'. $node->nid, - 'selector' => '#book-admin-edit select', - 'wrapper' => 'book-admin-edit-wrapper', - 'event' => 'change', - 'effect' => 'fade', - ), ); return $form; } /** * Handle submission of the book administrative page form. - * + * + * This function takes care to save parent menu items before their children. + * Saving menu items in the incorrect order can break the menu tree. + * * @see book_admin_edit() + * @see menu_overview_form_submit() */ function book_admin_edit_submit($form, &$form_state) { - foreach ($form_state['values']['table'] as $row) { - $node = node_load($row['nid'], FALSE); - - if ($row['title'] != $node->title || $row['weight'] != $node->book['weight']) { - - // Record changes in node's log message. - $log_messages = array(); - if ($row['title'] != $node->title) { - $log_messages[] = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $row['title'])); + // Save elements in the same order as defined in post rather than the form. + // This ensures parents are updated before their children, preventing orphans. + $order = array_flip(array_keys($form['#post']['table'])); + $form['table'] = array_merge($order, $form['table']); + + foreach (element_children($form['table']) as $key) { + if ($form['table'][$key]['#item']) { + $row = $form['table'][$key]; + $values = $form_state['values']['table'][$key]; + + // Update menu item if moved. + if ($row['plid']['#default_value'] != $values['plid'] || $row['weight']['#default_value'] != $values['weight']) { + $row['#item']['plid'] = $values['plid']; + $row['#item']['weight'] = $values['weight']; + menu_link_save($row['#item']); } - if ($row['weight'] != $node->book['weight']) { - $log_messages[] = t('Weight changed from %original to %current.', array('%original' => $node->book['weight'], '%current' => $row['weight'])); - } - - $node->title = $row['title']; - $node->book['link_title'] = $row['title']; - $node->book['weight'] = $row['weight']; - $node->revision = 1; - $node->log = implode(' ', $log_messages); - node_save($node); - watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); + // Update the title if changed. + if ($row['title']['#default_value'] != $values['title']) { + $node = node_load($values['nid'], FALSE); + $node->title = $values['title']; + $node->book['link_title'] = $values['title']; + $node->revision = 1; + $node->log = t('Title changed from %original to %current.', array('%original' => $node->title, '%current' => $values['title'])); + node_save($node); + watchdog('content', 'book: updated %title.', array('%title' => $node->title), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); + } } } - // Insure we have the current title - it may have been changed in the form. - $title = db_result(db_query("SELECT title FROM {node} WHERE nid = %d", $form['#node']->nid)); - drupal_set_message(t('Updated book %title.', array('%title' => $title))); + + drupal_set_message(t('Updated book %title.', array('%title' => $form['#node']->title))); } /** @@ -139,7 +135,10 @@ ); $tree = book_menu_subtree_data($node->book); - _book_admin_table_tree($tree, $form); + $tree = array_shift($tree); // Do not include the book item itself. + if ($tree['below']) { + _book_admin_table_tree($tree['below'], $form); + } return $form; } @@ -151,6 +150,7 @@ function _book_admin_table_tree($tree, &$form) { foreach ($tree as $key => $data) { $form[$key] = array( + '#item' => $data['link'], 'nid' => array('#type' => 'value', '#value' => $data['link']['nid']), 'depth' => array('#type' => 'value', '#value' => $data['link']['depth']), 'href' => array('#type' => 'value', '#value' => $data['link']['href']), @@ -158,12 +158,22 @@ '#type' => 'textfield', '#default_value' => $data['link']['link_title'], '#maxlength' => 255, + '#size' => 40, ), 'weight' => array( '#type' => 'weight', '#default_value' => $data['link']['weight'], '#delta' => 15, ), + 'plid' => array( + '#type' => 'textfield', + '#default_value' => $data['link']['plid'], + '#size' => 6, + ), + 'mlid' => array( + '#type' => 'hidden', + '#default_value' => $data['link']['mlid'], + ), ); if ($data['below']) { _book_admin_table_tree($data['below'], $form); @@ -179,7 +189,10 @@ * @ingroup themeable */ function theme_book_admin_table($form) { - $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); + drupal_add_tabledrag('book-outline', 'match', 'parent', 'book-plid', 'book-plid', 'book-mlid'); + drupal_add_tabledrag('book-outline', 'order', 'sibling', 'book-weight'); + + $header = array(t('Title'), t('Weight'), t('Parent'), array('data' => t('Operations'), 'colspan' => '3')); $rows = array(); $destination = drupal_get_destination(); @@ -187,10 +200,16 @@ foreach (element_children($form) as $key) { $nid = $form[$key]['nid']['#value']; $href = $form[$key]['href']['#value']; - $asterisk = (isset($form[$key]['#attributes']['class']) && strpos($form[$key]['#attributes']['class'], 'book-changed') !== FALSE) ? '*' : ''; + + // Add special classes to be used with tabledrag.js. + $form[$key]['plid']['#attributes']['class'] = 'book-plid'; + $form[$key]['mlid']['#attributes']['class'] = 'book-mlid'; + $form[$key]['weight']['#attributes']['class'] = 'book-weight'; + $data = array( - '
'. drupal_render($form[$key]['title']) . $asterisk .'
', + theme('indentation', $form[$key]['depth']['#value'] - 2) . drupal_render($form[$key]['title']), drupal_render($form[$key]['weight']), + drupal_render($form[$key]['plid']) . drupal_render($form[$key]['mlid']), l(t('view'), $href), $access ? l(t('edit'), 'node/'. $nid .'/edit', array('query' => $destination)) : ' ', $access ? l(t('delete'), 'node/'. $nid .'/delete', array('query' => $destination) ) : ' ', @@ -199,77 +218,11 @@ if (isset($form[$key]['#attributes'])) { $row = array_merge($row, $form[$key]['#attributes']); } + $row['class'] = empty($row['class']) ? 'draggable' : $row['class'] .' draggable'; $rows[] = $row; } - return theme('status_messages') . theme('table', $header, $rows); -} - -/** - * Menu callback for updating the book outline form. - */ -function book_admin_js_update() { - $cid = 'form_'. $_POST['form_build_id']; - $cache = cache_get($cid, 'cache_form'); - if ($cache) { - $form = $cache->data; - - $tree = book_menu_subtree_data($form['#node']->book); - _book_admin_js_update_tree($tree); - _book_admin_sort_tree($tree); - - // Create the form in the new order. - $table_form = array(); - _book_admin_table_tree($tree, $table_form); - - // Find the changed element on this request and save the current classes. - foreach (element_children($form['table']) as $key) { - if (isset($form['table'][$key]['#attributes'])) { - $table_form[$key]['#attributes'] = $form['table'][$key]['#attributes']; - } - if ($form['table'][$key]['weight']['#default_value'] != $_POST['table'][$key]['weight']) { - $changed_key = $key; - } - } - - // Preserve the order of the new form while merging the previous data. - $form_order = array_flip(array_keys($table_form)); // Save the form order. - $form['table'] = array_merge($form['table'], $table_form); // Merge the data. - $form['table'] = array_merge($form_order, $form['table']); // Put back into the correct order. - $form['table'][$changed_key]['#attributes']['class'] = 'book-changed'; - - cache_set($cid, $form, 'cache_form', $cache->expire); - - // Add the special AHAH class for new content. - $form['table'][$changed_key]['#attributes']['class'] = isset($form['table'][$changed_key]['#attributes']['class']) ? $form['table'][$changed_key]['#attributes']['class'] .' ahah-new-content' : 'ahah-new-content'; - - // Set a message for the user to save the form. - drupal_set_message(t('Your changes will not be saved until you click the Save book pages button.'), 'warning'); - - // Prevent duplicate wrappers. - unset($form['#prefix'], $form['#suffix']); - - // Render the form. - $form['#post'] = $_POST; - $form_state = array('submitted' => FALSE); - $form = form_builder('book_admin_edit', $form, $form_state); - $output = drupal_render($form); - - drupal_json(array('status' => TRUE, 'data' => $output)); - } -} - -/** - * Recursive helper to set new form weights to the tree. - */ -function _book_admin_js_update_tree(&$tree) { - foreach($tree as $key => $subtree) { - $tree[$key]['link']['weight'] = $_POST['table'][$key]['weight']; - $tree[$key]['link']['title'] = $_POST['table'][$key]['title']; - if (!empty($subtree['below'])) { - _book_admin_js_update_tree($tree[$key]['below']); - } - } + return theme('table', $header, $rows, array('id' => 'book-outline')); } /**