Skip to content
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

HOTFIX: Fix Nodes not able to be viewed if no menu item #414

Merged
merged 1 commit into from
Sep 8, 2023
Merged

HOTFIX: Fix Nodes not able to be viewed if no menu item #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions web/profiles/custom/yalesites_profile/modules/custom/ys_core/ys_core.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ type: module
description: YaleSites Core Configuation
core_version_requirement: '^9 || ^10'
package: YaleSites
dependencies:
- menu_item_extras
90 changes: 0 additions & 90 deletions web/profiles/custom/yalesites_profile/modules/custom/ys_core/ys_core.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
*/

use Drupal\Core\Cache\Cache;
use Drupal\Core\Entity\Entity\EntityFormDisplay;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
use Drupal\menu_item_extras\Entity\MenuItemExtrasMenuLinkContent;

/**
* @file
Expand Down Expand Up @@ -317,91 +315,3 @@ function ys_core_preprocess_image_widget(&$variables) {
function ys_core_taxonomy_term_update() {
Cache::invalidateTags(['rendered']);
}

/**
* The following functions add menu item extras fields to node add/edit forms.
*
* @see https://www.drupal.org/project/menu_item_extras/issues/2992096#comment-14140361
*/

/**
* Implements hook_form_FORM_ID_alter().
*/
function ys_core_form_node_page_edit_form_alter(&$form, FormStateInterface $form_state, $form_id) {
ys_core_page_form_alter($form, $form_state);
}

/**
* Implements hook_form_FORM_ID_alter().
*/
function ys_core_form_node_page_form_alter(&$form, FormStateInterface $form_state, $form_id) {
ys_core_page_form_alter($form, $form_state);
}

/**
* THe Drupal backend cache renderer service.
*
* @var array $form
* The form array.
* @var Drupal\Core\Form\FormStateInterface $form_state
* The current form state.
*/
function ys_core_page_form_alter(&$form, FormStateInterface $form_state) {

// Add menu link fields to node form.
if ($link = _ys_core_get_link($form_state)) {
$form_display = EntityFormDisplay::load('menu_link_content.' . $link->getMenuName() . '.default');
assert($form_display instanceof EntityFormDisplay);
$form['menu']['link']['extra'] = [
'#type' => 'container',
'#parents' => ['menu', 'extra'],
];
$form_display->buildForm($link, $form['menu']['link']['extra'], $form_state);
// Only keep custom fields, other properties already are in the form.
foreach (Element::children($form['menu']['link']['extra']) as $key) {
if (strpos($key, 'field_') !== 0) {
unset($form['menu']['link']['extra'][$key]);
}
}

foreach (array_keys($form['actions']) as $action) {
if ($action != 'preview' && isset($form['actions'][$action]['#type']) && $form['actions'][$action]['#type'] === 'submit') {
$form['actions'][$action]['#submit'][] = 'ys_core_save_menu_link_fields';
}
}
}
}

/**
* Saves the menu item extras when on the node add/edit pages.
*
* @throws \Drupal\Core\Entity\EntityStorageException
*/
function ys_core_save_menu_link_fields(array $form, FormStateInterface $form_state) {
if ($link = _ys_core_get_link($form_state)) {
$form_display = EntityFormDisplay::load('menu_link_content.' . $link->getMenuName() . '.default');
assert($form_display instanceof EntityFormDisplay);
$form_display->extractFormValues($link, $form['menu']['link']['extra'], $form_state);
$link->save();
}
}

/**
* Gets any menu item extras content.
*
* @return Drupal\menu_item_extras\Entity\MenuItemExtrasMenuLinkContent
* Menu item extras content.
*/
function _ys_core_get_link(FormStateInterface $form_state) {
/** @var Drupal\node\Entity $form_state */
$node = $form_state->getFormObject()->getEntity();
$defaults = menu_ui_get_menu_link_defaults($node);
if ($mlid = $defaults['entity_id']) {
return MenuItemExtrasMenuLinkContent::load($mlid);
}
return MenuItemExtrasMenuLinkContent::create($defaults);
}

/**
* End allow menu item extras fields to be included on node add and edit forms.
*/