diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml
index d17c48c..6fbb3f6 100644
--- a/core/modules/views/config/schema/views.display.schema.yml
+++ b/core/modules/views/config/schema/views.display.schema.yml
@@ -13,11 +13,6 @@ views_display_path:
route_name:
type: string
label: 'Route name'
-
-views.display.page:
- type: views_display_path
- label: 'Page display options'
- mapping:
menu:
type: mapping
label: 'Menu'
@@ -72,6 +67,10 @@ views.display.page:
type: string
label: 'Menu name'
+views.display.page:
+ type: views_display_path
+ label: 'Page display options'
+
views.display.block:
type: views_display
label: 'Block display options'
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index d79b75b..9f24f10 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -115,37 +115,6 @@ public static function &getPageRenderArray() {
/**
* {@inheritdoc}
*/
- protected function defineOptions() {
- $options = parent::defineOptions();
-
- $options['menu'] = array(
- 'contains' => array(
- 'type' => array('default' => 'none'),
- 'title' => array('default' => ''),
- 'description' => array('default' => ''),
- 'weight' => array('default' => 0),
- 'enabled' => array('default' => TRUE),
- 'menu_name' => array('default' => 'main'),
- 'parent' => array('default' => ''),
- 'context' => array('default' => ''),
- 'expanded' => array('default' => FALSE),
- ),
- );
- $options['tab_options'] = array(
- 'contains' => array(
- 'type' => array('default' => 'none'),
- 'title' => array('default' => ''),
- 'description' => array('default' => ''),
- 'weight' => array('default' => 0),
- ),
- );
-
- return $options;
- }
-
- /**
- * {@inheritdoc}
- */
public static function buildBasicRenderable($view_id, $display_id, array $args = [], Route $route = NULL) {
$build = parent::buildBasicRenderable($view_id, $display_id, $args);
@@ -185,327 +154,6 @@ public function execute() {
/**
* {@inheritdoc}
*/
- public function optionsSummary(&$categories, &$options) {
- parent::optionsSummary($categories, $options);
-
- $menu = $this->getOption('menu');
- if (!is_array($menu)) {
- $menu = array('type' => 'none');
- }
- switch ($menu['type']) {
- case 'none':
- default:
- $menu_str = $this->t('No menu');
- break;
- case 'normal':
- $menu_str = $this->t('Normal: @title', array('@title' => $menu['title']));
- break;
- case 'tab':
- case 'default tab':
- $menu_str = $this->t('Tab: @title', array('@title' => $menu['title']));
- break;
- }
-
- $options['menu'] = array(
- 'category' => 'page',
- 'title' => $this->t('Menu'),
- 'value' => views_ui_truncate($menu_str, 24),
- );
-
- // This adds a 'Settings' link to the style_options setting if the style
- // has options.
- if ($menu['type'] == 'default tab') {
- $options['menu']['setting'] = $this->t('Parent menu item');
- $options['menu']['links']['tab_options'] = $this->t('Change settings for the parent menu');
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildOptionsForm(&$form, FormStateInterface $form_state) {
- parent::buildOptionsForm($form, $form_state);
-
- switch ($form_state->get('section')) {
- case 'menu':
- $form['#title'] .= $this->t('Menu item entry');
- $form['menu'] = array(
- '#prefix' => '',
- '#suffix' => '
',
- '#tree' => TRUE,
- );
- $menu = $this->getOption('menu');
- if (empty($menu)) {
- $menu = array('type' => 'none', 'title' => '', 'weight' => 0, 'expanded' => FALSE);
- }
- $form['menu']['type'] = array(
- '#prefix' => '',
- '#suffix' => '
',
- '#title' => $this->t('Type'),
- '#type' => 'radios',
- '#options' => array(
- 'none' => $this->t('No menu entry'),
- 'normal' => $this->t('Normal menu entry'),
- 'tab' => $this->t('Menu tab'),
- 'default tab' => $this->t('Default menu tab')
- ),
- '#default_value' => $menu['type'],
- );
-
- $form['menu']['title'] = array(
- '#prefix' => '',
- '#title' => $this->t('Menu link title'),
- '#type' => 'textfield',
- '#default_value' => $menu['title'],
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="menu[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'tab'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'default tab'),
- ),
- ),
- ),
- );
- $form['menu']['description'] = array(
- '#title' => $this->t('Description'),
- '#type' => 'textfield',
- '#default_value' => $menu['description'],
- '#description' => $this->t("Shown when hovering over the menu link."),
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="menu[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'tab'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'default tab'),
- ),
- ),
- ),
- );
- $form['menu']['expanded'] = [
- '#title' => $this->t('Show as expanded'),
- '#type' => 'checkbox',
- '#default_value' => !empty($menu['expanded']),
- '#description' => $this->t('If selected and this menu link has children, the menu will always appear expanded.'),
- ];
-
- // Only display the parent selector if Menu UI module is enabled.
- $menu_parent = $menu['menu_name'] . ':' . $menu['parent'];
- if (\Drupal::moduleHandler()->moduleExists('menu_ui')) {
- $menu_link = 'views_view:views.' . $form_state->get('view')->id() . '.' . $form_state->get('display_id');
- $form['menu']['parent'] = \Drupal::service('menu.parent_form_selector')->parentSelectElement($menu_parent, $menu_link);
- $form['menu']['parent'] += array(
- '#title' => $this->t('Parent'),
- '#description' => $this->t('The maximum depth for a link and all its children is fixed. Some menu links may not be available as parents if selecting them would exceed this limit.'),
- '#attributes' => array('class' => array('menu-title-select')),
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="menu[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'tab'),
- ),
- ),
- ),
- );
- }
- else {
- $form['menu']['parent'] = array(
- '#type' => 'value',
- '#value' => $menu_parent,
- );
- $form['menu']['markup'] = array(
- '#markup' => $this->t('Menu selection requires the activation of Menu UI module.'),
- );
- }
- $form['menu']['weight'] = array(
- '#title' => $this->t('Weight'),
- '#type' => 'textfield',
- '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
- '#description' => $this->t('In the menu, the heavier links will sink and the lighter links will be positioned nearer the top.'),
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="menu[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'tab'),
- ),
- array(
- ':input[name="menu[type]"]' => array('value' => 'default tab'),
- ),
- ),
- ),
- );
- $form['menu']['context'] = array(
- '#title' => $this->t('Context'),
- '#suffix' => '
',
- '#type' => 'checkbox',
- '#default_value' => !empty($menu['context']),
- '#description' => $this->t('Displays the link in contextual links'),
- '#states' => array(
- 'visible' => array(
- ':input[name="menu[type]"]' => array('value' => 'tab'),
- ),
- ),
- );
- break;
- case 'tab_options':
- $form['#title'] .= $this->t('Default tab options');
- $tab_options = $this->getOption('tab_options');
- if (empty($tab_options)) {
- $tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
- }
-
- $form['tab_markup'] = array(
- '#markup' => '' . $this->t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
',
- );
-
- $form['tab_options'] = array(
- '#prefix' => '',
- '#suffix' => '
',
- '#tree' => TRUE,
- );
- $form['tab_options']['type'] = array(
- '#prefix' => '',
- '#suffix' => '
',
- '#title' => $this->t('Parent menu item'),
- '#type' => 'radios',
- '#options' => array('none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu item'), 'tab' => $this->t('Menu tab')),
- '#default_value' => $tab_options['type'],
- );
- $form['tab_options']['title'] = array(
- '#prefix' => '',
- '#title' => $this->t('Title'),
- '#type' => 'textfield',
- '#default_value' => $tab_options['title'],
- '#description' => $this->t('If creating a parent menu item, enter the title of the item.'),
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="tab_options[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="tab_options[type]"]' => array('value' => 'tab'),
- ),
- ),
- ),
- );
- $form['tab_options']['description'] = array(
- '#title' => $this->t('Description'),
- '#type' => 'textfield',
- '#default_value' => $tab_options['description'],
- '#description' => $this->t('If creating a parent menu item, enter the description of the item.'),
- '#states' => array(
- 'visible' => array(
- array(
- ':input[name="tab_options[type]"]' => array('value' => 'normal'),
- ),
- array(
- ':input[name="tab_options[type]"]' => array('value' => 'tab'),
- ),
- ),
- ),
- );
- $form['tab_options']['weight'] = array(
- '#suffix' => '
',
- '#title' => $this->t('Tab weight'),
- '#type' => 'textfield',
- '#default_value' => $tab_options['weight'],
- '#size' => 5,
- '#description' => $this->t('If the parent menu item is a tab, enter the weight of the tab. Heavier tabs will sink and the lighter tabs will be positioned nearer to the first menu item.'),
- '#states' => array(
- 'visible' => array(
- ':input[name="tab_options[type]"]' => array('value' => 'tab'),
- ),
- ),
- );
- break;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateOptionsForm(&$form, FormStateInterface $form_state) {
- parent::validateOptionsForm($form, $form_state);
-
- if ($form_state->get('section') == 'menu') {
- $path = $this->getOption('path');
- $menu_type = $form_state->getValue(array('menu', 'type'));
- if ($menu_type == 'normal' && strpos($path, '%') !== FALSE) {
- $form_state->setError($form['menu']['type'], $this->t('Views cannot create normal menu items for paths with a % in them.'));
- }
-
- if ($menu_type == 'default tab' || $menu_type == 'tab') {
- $bits = explode('/', $path);
- $last = array_pop($bits);
- if ($last == '%') {
- $form_state->setError($form['menu']['type'], $this->t('A display whose path ends with a % cannot be a tab.'));
- }
- }
-
- if ($menu_type != 'none' && $form_state->isValueEmpty(array('menu', 'title'))) {
- $form_state->setError($form['menu']['title'], $this->t('Title is required for this menu type.'));
- }
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function submitOptionsForm(&$form, FormStateInterface $form_state) {
- parent::submitOptionsForm($form, $form_state);
-
- switch ($form_state->get('section')) {
- case 'menu':
- $menu = $form_state->getValue('menu');
- list($menu['menu_name'], $menu['parent']) = explode(':', $menu['parent'], 2);
- $this->setOption('menu', $menu);
- // send ajax form to options page if we use it.
- if ($form_state->getValue(array('menu', 'type')) == 'default tab') {
- $form_state->get('view')->addFormToStack('display', $this->display['id'], 'tab_options');
- }
- break;
- case 'tab_options':
- $this->setOption('tab_options', $form_state->getValue('tab_options'));
- break;
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function validate() {
- $errors = parent::validate();
-
- $menu = $this->getOption('menu');
- if (!empty($menu['type']) && $menu['type'] != 'none' && empty($menu['title'])) {
- $errors[] = $this->t('Display @display is set to use a menu but the menu link text is not set.', array('@display' => $this->display['display_title']));
- }
-
- if ($menu['type'] == 'default tab') {
- $tab_options = $this->getOption('tab_options');
- if (!empty($tab_options['type']) && $tab_options['type'] != 'none' && empty($tab_options['title'])) {
- $errors[] = $this->t('Display @display is set to use a parent menu but the parent menu link text is not set.', array('@display' => $this->display['display_title']));
- }
- }
-
- return $errors;
- }
-
- /**
- * {@inheritdoc}
- */
public function getArgumentText() {
return array(
'filter value not present' => $this->t('When the filter value is NOT in the URL'),
diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
index 3654d63..6c0eed8 100644
--- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
@@ -111,6 +111,27 @@ protected function defineOptions() {
$options = parent::defineOptions();
$options['path'] = array('default' => '');
$options['route_name'] = array('default' => '');
+ $options['menu'] = array(
+ 'contains' => array(
+ 'type' => array('default' => 'none'),
+ 'title' => array('default' => ''),
+ 'description' => array('default' => ''),
+ 'weight' => array('default' => 0),
+ 'enabled' => array('default' => TRUE),
+ 'menu_name' => array('default' => 'main'),
+ 'parent' => array('default' => ''),
+ 'context' => array('default' => ''),
+ 'expanded' => array('default' => FALSE),
+ ),
+ );
+ $options['tab_options'] = array(
+ 'contains' => array(
+ 'type' => array('default' => 'none'),
+ 'title' => array('default' => ''),
+ 'description' => array('default' => ''),
+ 'weight' => array('default' => 0),
+ ),
+ );
return $options;
}
@@ -426,6 +447,68 @@ public function optionsSummary(&$categories, &$options) {
'title' => $this->t('Path'),
'value' => views_ui_truncate($path, 24),
);
+
+ $menu = $this->getOption('menu');
+ if (!is_array($menu)) {
+ $menu = array('type' => 'none');
+ }
+ switch ($menu['type']) {
+ case 'none':
+ default:
+ $menu_str = $this->t('No menu');
+ break;
+ case 'normal':
+ $menu_str = $this->t('Normal: @title', array('@title' => $menu['title']));
+ break;
+ case 'tab':
+ case 'default tab':
+ $menu_str = $this->t('Tab: @title', array('@title' => $menu['title']));
+ break;
+ }
+
+ $options['menu'] = array(
+ 'category' => 'page',
+ 'title' => $this->t('Menu'),
+ 'value' => views_ui_truncate($menu_str, 24),
+ );
+
+ // This adds a 'Settings' link to the style_options setting if the style
+ // has options.
+ if ($menu['type'] == 'default tab') {
+ $options['menu']['setting'] = $this->t('Parent menu item');
+ $options['menu']['links']['tab_options'] = $this->t('Change settings for the parent menu');
+ }
+
+ $menu = $this->getOption('menu');
+ if (!is_array($menu)) {
+ $menu = array('type' => 'none');
+ }
+ switch ($menu['type']) {
+ case 'none':
+ default:
+ $menu_str = $this->t('No menu');
+ break;
+ case 'normal':
+ $menu_str = $this->t('Normal: @title', array('@title' => $menu['title']));
+ break;
+ case 'tab':
+ case 'default tab':
+ $menu_str = $this->t('Tab: @title', array('@title' => $menu['title']));
+ break;
+ }
+
+ $options['menu'] = array(
+ 'category' => 'page',
+ 'title' => $this->t('Menu'),
+ 'value' => views_ui_truncate($menu_str, 24),
+ );
+
+ // This adds a 'Settings' link to the style_options setting if the style
+ // has options.
+ if ($menu['type'] == 'default tab') {
+ $options['menu']['setting'] = $this->t('Parent menu item');
+ $options['menu']['links']['tab_options'] = $this->t('Change settings for the parent menu');
+ }
}
/**
@@ -449,6 +532,209 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#maxlength' => 254,
);
break;
+ case 'menu':
+ $form['#title'] .= $this->t('Menu item entry');
+ $form['menu'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#tree' => TRUE,
+ );
+ $menu = $this->getOption('menu');
+ if (empty($menu)) {
+ $menu = array('type' => 'none', 'title' => '', 'weight' => 0, 'expanded' => FALSE);
+ }
+ $form['menu']['type'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#title' => $this->t('Type'),
+ '#type' => 'radios',
+ '#options' => array(
+ 'none' => $this->t('No menu entry'),
+ 'normal' => $this->t('Normal menu entry'),
+ 'tab' => $this->t('Menu tab'),
+ 'default tab' => $this->t('Default menu tab')
+ ),
+ '#default_value' => $menu['type'],
+ );
+
+ $form['menu']['title'] = array(
+ '#prefix' => '',
+ '#title' => $this->t('Menu link title'),
+ '#type' => 'textfield',
+ '#default_value' => $menu['title'],
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
+ );
+ $form['menu']['description'] = array(
+ '#title' => $this->t('Description'),
+ '#type' => 'textfield',
+ '#default_value' => $menu['description'],
+ '#description' => $this->t("Shown when hovering over the menu link."),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
+ );
+ $form['menu']['expanded'] = [
+ '#title' => $this->t('Show as expanded'),
+ '#type' => 'checkbox',
+ '#default_value' => !empty($menu['expanded']),
+ '#description' => $this->t('If selected and this menu link has children, the menu will always appear expanded.'),
+ ];
+
+ // Only display the parent selector if Menu UI module is enabled.
+ $menu_parent = $menu['menu_name'] . ':' . $menu['parent'];
+ if (\Drupal::moduleHandler()->moduleExists('menu_ui')) {
+ $menu_link = 'views_view:views.' . $form_state->get('view')->id() . '.' . $form_state->get('display_id');
+ $form['menu']['parent'] = \Drupal::service('menu.parent_form_selector')->parentSelectElement($menu_parent, $menu_link);
+ $form['menu']['parent'] += array(
+ '#title' => $this->t('Parent'),
+ '#description' => $this->t('The maximum depth for a link and all its children is fixed. Some menu links may not be available as parents if selecting them would exceed this limit.'),
+ '#attributes' => array('class' => array('menu-title-select')),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
+ );
+ }
+ else {
+ $form['menu']['parent'] = array(
+ '#type' => 'value',
+ '#value' => $menu_parent,
+ );
+ $form['menu']['markup'] = array(
+ '#markup' => $this->t('Menu selection requires the activation of Menu UI module.'),
+ );
+ }
+ $form['menu']['weight'] = array(
+ '#title' => $this->t('Weight'),
+ '#type' => 'textfield',
+ '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
+ '#description' => $this->t('In the menu, the heavier links will sink and the lighter links will be positioned nearer the top.'),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ array(
+ ':input[name="menu[type]"]' => array('value' => 'default tab'),
+ ),
+ ),
+ ),
+ );
+ $form['menu']['context'] = array(
+ '#title' => $this->t('Context'),
+ '#suffix' => '
',
+ '#type' => 'checkbox',
+ '#default_value' => !empty($menu['context']),
+ '#description' => $this->t('Displays the link in contextual links'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="menu[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ );
+ break;
+ case 'tab_options':
+ $form['#title'] .= $this->t('Default tab options');
+ $tab_options = $this->getOption('tab_options');
+ if (empty($tab_options)) {
+ $tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
+ }
+
+ $form['tab_markup'] = array(
+ '#markup' => '' . $this->t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is foo/bar/baz, the parent path would be foo/bar.') . '
',
+ );
+
+ $form['tab_options'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#tree' => TRUE,
+ );
+ $form['tab_options']['type'] = array(
+ '#prefix' => '',
+ '#suffix' => '
',
+ '#title' => $this->t('Parent menu item'),
+ '#type' => 'radios',
+ '#options' => array('none' => $this->t('Already exists'), 'normal' => $this->t('Normal menu item'), 'tab' => $this->t('Menu tab')),
+ '#default_value' => $tab_options['type'],
+ );
+ $form['tab_options']['title'] = array(
+ '#prefix' => '',
+ '#title' => $this->t('Title'),
+ '#type' => 'textfield',
+ '#default_value' => $tab_options['title'],
+ '#description' => $this->t('If creating a parent menu item, enter the title of the item.'),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
+ );
+ $form['tab_options']['description'] = array(
+ '#title' => $this->t('Description'),
+ '#type' => 'textfield',
+ '#default_value' => $tab_options['description'],
+ '#description' => $this->t('If creating a parent menu item, enter the description of the item.'),
+ '#states' => array(
+ 'visible' => array(
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'normal'),
+ ),
+ array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ ),
+ );
+ $form['tab_options']['weight'] = array(
+ '#suffix' => '
',
+ '#title' => $this->t('Tab weight'),
+ '#type' => 'textfield',
+ '#default_value' => $tab_options['weight'],
+ '#size' => 5,
+ '#description' => $this->t('If the parent menu item is a tab, enter the weight of the tab. Heavier tabs will sink and the lighter tabs will be positioned nearer to the first menu item.'),
+ '#states' => array(
+ 'visible' => array(
+ ':input[name="tab_options[type]"]' => array('value' => 'tab'),
+ ),
+ ),
+ );
+ break;
}
}
@@ -467,6 +753,26 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
// Automatically remove '/' and trailing whitespace from path.
$form_state->setValue('path', trim($form_state->getValue('path'), '/ '));
}
+
+ if ($form_state->get('section') == 'menu') {
+ $path = $this->getOption('path');
+ $menu_type = $form_state->getValue(array('menu', 'type'));
+ if ($menu_type == 'normal' && strpos($path, '%') !== FALSE) {
+ $form_state->setError($form['menu']['type'], $this->t('Views cannot create normal menu items for paths with a % in them.'));
+ }
+
+ if ($menu_type == 'default tab' || $menu_type == 'tab') {
+ $bits = explode('/', $path);
+ $last = array_pop($bits);
+ if ($last == '%') {
+ $form_state->setError($form['menu']['type'], $this->t('A display whose path ends with a % cannot be a tab.'));
+ }
+ }
+
+ if ($menu_type != 'none' && $form_state->isValueEmpty(array('menu', 'title'))) {
+ $form_state->setError($form['menu']['title'], $this->t('Title is required for this menu type.'));
+ }
+ }
}
/**
@@ -475,8 +781,22 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
public function submitOptionsForm(&$form, FormStateInterface $form_state) {
parent::submitOptionsForm($form, $form_state);
- if ($form_state->get('section') == 'path') {
- $this->setOption('path', $form_state->getValue('path'));
+ switch ($form_state->get('section')) {
+ case 'path':
+ $this->setOption('path', $form_state->getValue('path'));
+ break;
+ case 'menu':
+ $menu = $form_state->getValue('menu');
+ list($menu['menu_name'], $menu['parent']) = explode(':', $menu['parent'], 2);
+ $this->setOption('menu', $menu);
+ // send ajax form to options page if we use it.
+ if ($form_state->getValue(array('menu', 'type')) == 'default tab') {
+ $form_state->get('view')->addFormToStack('display', $this->display['id'], 'tab_options');
+ }
+ break;
+ case 'tab_options':
+ $this->setOption('tab_options', $form_state->getValue('tab_options'));
+ break;
}
}
@@ -529,6 +849,18 @@ public function validate() {
$errors += $this->validatePath($this->getOption('path'));
+ $menu = $this->getOption('menu');
+ if (!empty($menu['type']) && $menu['type'] != 'none' && empty($menu['title'])) {
+ $errors[] = $this->t('Display @display is set to use a menu but the menu link text is not set.', array('@display' => $this->display['display_title']));
+ }
+
+ if ($menu['type'] == 'default tab') {
+ $tab_options = $this->getOption('tab_options');
+ if (!empty($tab_options['type']) && $tab_options['type'] != 'none' && empty($tab_options['title'])) {
+ $errors[] = $this->t('Display @display is set to use a parent menu but the parent menu link text is not set.', array('@display' => $this->display['display_title']));
+ }
+ }
+
return $errors;
}