summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries Buytaert2011-09-25 09:38:43 (GMT)
committerDries Buytaert2011-09-25 09:38:43 (GMT)
commit27979342c39be6443d3f9067b720030250beda79 (patch)
tree2e6da35b040ea6b5eca5bbe114bc943ca62e31c5
parente48eb7b074aab3cc587f22043c35cc2f028c7864 (diff)
- Patch #955848 by anrikun, Kars-T, catch, chx: when editing an existing node with a link, the link itself is listed in 'Parent item'
-rw-r--r--modules/menu/menu.module38
-rw-r--r--modules/menu/menu.test38
2 files changed, 64 insertions, 12 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index fa58373..cd42256 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -322,6 +322,9 @@ function menu_delete($menu) {
* @param $item
* The menu item or the node type for which to generate a list of parents.
* If $item['mlid'] == 0 then the complete tree is returned.
+ * @param $type
+ * The node type for which to generate a list of parents.
+ * If $item itself is a node type then $type is ignored.
* @return
* An array of menu link titles keyed on the a string containing the menu name
* and mlid. The list excludes the given item and its children.
@@ -329,7 +332,7 @@ function menu_delete($menu) {
* @todo This has to be turned into a #process form element callback. The
* 'menu_override_parent_selector' variable is entirely superfluous.
*/
-function menu_parent_options($menus, $item) {
+function menu_parent_options($menus, $item, $type = '') {
// The menu_links table can be practically any size and we need a way to
// allow contrib modules to provide more scalable pattern choosers.
// hook_form_alter is too late in itself because all the possible parents are
@@ -339,18 +342,22 @@ function menu_parent_options($menus, $item) {
}
$available_menus = array();
- if (is_array($item)) {
- // If $item is an array fill it with all menus given to this function.
+ if (!is_array($item)) {
+ // If $item is not an array then it is a node type.
+ // Use it as $type and prepare a dummy menu item for _menu_get_options().
+ $type = $item;
+ $item = array('mlid' => 0);
+ }
+ if (empty($type)) {
+ // If no node type is set, use all menus given to this function.
$available_menus = $menus;
}
else {
- // If $item is a node type, get all available menus for this type and
- // prepare a dummy menu item for _menu_parent_depth_limit().
- $type_menus = variable_get('menu_options_' . $item, array('main-menu' => 'main-menu'));
+ // If a node type is set, use all available menus for this type.
+ $type_menus = variable_get('menu_options_' . $type, array('main-menu' => 'main-menu'));
foreach ($type_menus as $menu) {
$available_menus[$menu] = $menu;
}
- $item = array('mlid' => 0);
}
return _menu_get_options($menus, $available_menus, $item);
@@ -600,15 +607,18 @@ function _menu_parent_depth_limit($item) {
* @see menu_node_submit()
*/
function menu_form_node_form_alter(&$form, $form_state) {
- // Generate a list of possible parents.
+ // Generate a list of possible parents (not including this link or descendants).
// @todo This must be handled in a #process handler.
+ $link = $form['#node']->menu;
$type = $form['#node']->type;
- $options = menu_parent_options(menu_get_menus(), $type);
+ // menu_parent_options() is goofy and can actually handle either a menu link
+ // or a node type both as second argument. Pick based on whether there is
+ // a link already (menu_node_prepare() sets mlid default to 0).
+ $options = menu_parent_options(menu_get_menus(), $link['mlid'] ? $link : $type);
// If no possible parent menu items were found, there is nothing to display.
if (empty($options)) {
return;
}
- $link = $form['#node']->menu;
$form['menu'] = array(
'#type' => 'fieldset',
@@ -659,9 +669,13 @@ function menu_form_node_form_alter(&$form, $form_state) {
);
$default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0'));
- // @todo This will fail with the new selective menus per content type.
+ // If the current parent menu item is not present in options, use the first
+ // available option as default value.
+ // @todo User should not be allowed to access menu link settings in such a
+ // case.
if (!isset($options[$default])) {
- $default = 'navigation:0';
+ $array = array_keys($options);
+ $default = reset($array);
}
$form['menu']['link']['parent'] = array(
'#type' => 'select',
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index d1f16f6..08bb7e8 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -680,5 +680,43 @@ class MenuNodeTestCase extends DrupalWebTestCase {
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
$link = menu_link_load($item['mlid']);
$this->assertTrue($link, t('Link in not allowed menu still exists after saving node'));
+
+ // Move the menu link back to the Navigation menu.
+ $item['menu_name'] = 'navigation';
+ menu_link_save($item);
+ // Create a second node.
+ $child_node = $this->drupalCreateNode(array('type' => 'article'));
+ // Assign a menu link to the second node, being a child of the first one.
+ $child_item = array(
+ 'link_path' => 'node/'. $child_node->nid,
+ 'link_title' => $this->randomName(16),
+ 'plid' => $item['mlid'],
+ );
+ menu_link_save($child_item);
+ // Edit the first node.
+ $this->drupalGet('node/'. $node->nid .'/edit');
+ // Assert that it is not possible to set the parent of the first node to itself or the second node.
+ $this->assertNoOption('edit-menu-parent', 'navigation:'. $item['mlid']);
+ $this->assertNoOption('edit-menu-parent', 'navigation:'. $child_item['mlid']);
+ }
+
+ /**
+ * Asserts that a select option in the current page does not exist.
+ *
+ * @param $id
+ * Id of select field to assert.
+ * @param $option
+ * Option to assert.
+ * @param $message
+ * Message to display.
+ * @return
+ * TRUE on pass, FALSE on fail.
+ *
+ * @todo move to simpletest drupal_web_test_case.php.
+ */
+ protected function assertNoOption($id, $option, $message = '') {
+ $selects = $this->xpath('//select[@id=:id]', array(':id' => $id));
+ $options = $this->xpath('//select[@id=:id]//option[@value=:option]', array(':id' => $id, ':option' => $option));
+ return $this->assertTrue(isset($selects[0]) && !isset($options[0]), $message ? $message : t('Option @option for field @id does not exist.', array('@option' => $option, '@id' => $id)), t('Browser'));
}
}