Skip to content

8.x 1x always show edit children #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomvoes wants to merge 2 commits into
base: 8.x-1.x-working-order
Choose a base branch
from
Open

8.x 1x always show edit children #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96b2ed8
Show the "edit children" link when all children are disabled
tomvoes Jan 29, 2018
287f99d
Remove hardcoded fixed depth on menu slice overview.
tomvoes Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/MenuFormController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public function process_links(&$form, &$links, $menu_link) {

$mlid = (int)$links[$id]['#item']->link->getMetaData()['entity_id'];

if ($form['links'][$id]['#item']->hasChildren) {
if ($form['links'][$id]['#item']->hasChildren || $this->menuLinkHasChildren($links[$id]['#item'])) {
if (is_null($menu_link) || (isset($menu_link) && $menu_link->id() != $mlid)) {
$form['links'][$id]['title'][] = array(
'#type' => 'big_menu_button',
Expand Down Expand Up @@ -248,6 +248,24 @@ public function process_links(&$form, &$links, $menu_link) {
}
}

/**
* Check if the Element has any children, enabled and disabled.
*
* @param \Drupal\Core\Menu\MenuLinkTreeElement $element
* The parent element.
*
* @return bool
*/
protected function menuLinkHasChildren(MenuLinkTreeElement $element) {
$depth = $element->depth + 1;
$tree_params = new MenuTreeParameters();
$tree_params->setMinDepth($depth);
$tree_params->setMaxDepth($depth);
$tree_params->addExpandedParents([$element->link->getPluginId()]);
$tree = $this->menuTree->load($this->entity->id(), $tree_params);
return !empty($tree);
}

/**
* AJAX function called when a "Show Children" button is pressed.
*
Expand Down
2 changes: 1 addition & 1 deletion src/MenuFormLinkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function process_links(&$form, &$links, $menu_link) {

$form['links'][$id]['root'][] = array();

if ($form['links'][$id]['#item']->hasChildren) {
if ($form['links'][$id]['#item']->hasChildren || $this->menuLinkHasChildren($element['#item'])) {
if (is_null($menu_link) || (isset($menu_link) && $menu_link != $element['#item']->link->getPluginId())) {
$uri = Url::fromRoute('bigmenu.menu_link', array(
'menu' => $this->entity->id(),
Expand Down
1 change: 0 additions & 1 deletion src/MenuSliceFormController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ protected function prepareEntity() {
* @inheritdoc
*/
protected function buildOverviewFormWithDepth(array &$form, FormStateInterface $form_state, $depth = 1, $menu_link = NULL) {
$depth = 5;

// Ensure that menu_overview_form_submit() knows the parents of this form
// section.
Expand Down