diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module index 53dd17c..7eaccbe 100644 --- a/core/modules/menu/menu.module +++ b/core/modules/menu/menu.module @@ -608,7 +608,19 @@ function menu_node_submit(EntityInterface $node, $form, $form_state) { function menu_form_node_type_form_alter(&$form, $form_state) { $menu_options = menu_get_menus(); $type = $form_state['controller']->getEntity(); - $node_type_config = \Drupal::config('menu.entity.node.' . $type->id()); + if ($type->id()) { + $node_type_config = \Drupal::config('menu.entity.node.' . $type->id()); + $config_values = array( + 'available_menus' => $node_type_config->get('available_menus'), + 'parent' => $node_type_config->get('parent'), + ); + } + else { + $config_values = array( + 'available_menus' => array('main'), + 'parent' => 'main:0', + ); + } $form['menu'] = array( '#type' => 'details', '#title' => t('Menu settings'), @@ -621,7 +633,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_options'] = array( '#type' => 'checkboxes', '#title' => t('Available menus'), - '#default_value' => $node_type_config->get('available_menus'), + '#default_value' => $config_values['available_menus'], '#options' => $menu_options, '#description' => t('The menus available to place links in for this content type.'), ); @@ -634,7 +646,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_parent'] = array( '#type' => 'select', '#title' => t('Default parent item'), - '#default_value' => $node_type_config->get('parent'), + '#default_value' => $config_values['parent'], '#options' => $options, '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'), '#attributes' => array('class' => array('menu-title-select')),