diff --git a/core/modules/menu_link/src/Plugin/Field/FieldType/MenuLinkItem.php b/core/modules/menu_link/src/Plugin/Field/FieldType/MenuLinkItem.php index c1e1c8a..cef5d91 100644 --- a/core/modules/menu_link/src/Plugin/Field/FieldType/MenuLinkItem.php +++ b/core/modules/menu_link/src/Plugin/Field/FieldType/MenuLinkItem.php @@ -23,15 +23,6 @@ * label = @Translation("Menu link"), * description = @Translation("Stores a title, menu and parent to insert a link to the current entity."), * default_widget = "menu_link_default", - * column_groups = { - * "title-description-weight" = { - * "label" = @Translation("Title, Description, and Weight"), - * "translatable" = TRUE, - * "columns" = { - * "title", "description", "weight" - * } - * }, - * }, * list_class = "\Drupal\menu_link\Plugin\Field\MenuLinkItemList", * ) */ diff --git a/core/modules/menu_link/src/Tests/MenuLinkFieldTranslateUITest.php b/core/modules/menu_link/src/Tests/MenuLinkFieldTranslateUITest.php index 96445ec..6f5a464 100644 --- a/core/modules/menu_link/src/Tests/MenuLinkFieldTranslateUITest.php +++ b/core/modules/menu_link/src/Tests/MenuLinkFieldTranslateUITest.php @@ -10,13 +10,14 @@ use Drupal\content_translation\Tests\ContentTranslationUITest; use Drupal\Core\Entity\EntityInterface; +use Drupal\node\Tests\NodeTranslationUITest; /** * Tests the translation support for menu field based menu links. * * @group menu_link */ -class MenuLinkFieldTranslateUITest extends ContentTranslationUITest { +class MenuLinkFieldTranslateUITest extends NodeTranslationUITest { /** * The profile to install as a basis for testing. @@ -41,15 +42,7 @@ class MenuLinkFieldTranslateUITest extends ContentTranslationUITest { * {@inheritdoc} */ protected function setUp() { - $this->entityTypeId = 'node'; - $this->bundle = 'article'; parent::setUp(); - - // Display the language selector. - $this->drupalLogin($this->administrator); - $edit = ['language_configuration[language_alterable]' => TRUE]; - $this->drupalPostForm("admin/structure/types/manage/{$this->bundle}", $edit, t('Save content type')); - $this->drupalLogin($this->translator); } /** @@ -73,29 +66,4 @@ protected function getAdministratorPermissions() { return array_merge(parent::getAdministratorPermissions(), ['administer menu', 'access administration pages', 'administer content types', 'administer node fields', 'access content overview', 'bypass node access', 'administer languages', 'administer themes', 'view the administration theme']); } - /** - * {@inheritdoc} - */ - protected function getFormSubmitSuffix(EntityInterface $entity, $langcode) { - if (!$entity->isNew() && $entity->isTranslatable()) { - $translations = $entity->getTranslationLanguages(); - if ((count($translations) > 1 || !isset($translations[$langcode])) && ($field = $entity->getFieldDefinition('status'))) { - return ' ' . ($field->isTranslatable() ? t('(this translation)') : t('(all translations)')); - } - } - return ''; - } - - /** - * {@inheritdoc} - */ - protected function getFormSubmitAction(EntityInterface $entity, $langcode) { - if ($entity->getTranslation($langcode)->isPublished()) { - return t('Save and keep published') . $this->getFormSubmitSuffix($entity, $langcode); - } - else { - return t('Save and keep unpublished') . $this->getFormSubmitSuffix($entity, $langcode); - } - } - }