diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php index 00e3644..af6598a 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php @@ -33,6 +33,7 @@ class ContentModerationStateTest extends KernelTestBase { 'media_test_source', 'image', 'file', + 'taxonomy', 'field', 'content_moderation', 'user', @@ -63,6 +64,7 @@ protected function setUp() { $this->installEntitySchema('block_content'); $this->installEntitySchema('media'); $this->installEntitySchema('file'); + $this->installEntitySchema('taxonomy_term'); $this->installEntitySchema('content_moderation_state'); $this->installConfig('content_moderation'); $this->installSchema('file', 'file_usage'); @@ -161,6 +163,9 @@ public function basicModerationTestCases() { 'Media' => [ 'media', ], + 'Taxonomy term' => [ + 'taxonomy_term', + ], 'Test entity - revisions, data table, and published interface' => [ 'entity_test_mulrevpub', ], @@ -214,7 +219,7 @@ public function testContentModerationStateDataRemoval($entity_type_id) { ConfigurableLanguage::createFromLangcode($langcode) ->save(); $entity3->save(); - $translation = $entity3->addTranslation($langcode, ['title' => 'Titolo test']); + $translation = $entity3->addTranslation($langcode, [$entity_keys['label'] => 'Titolo test']); // Make sure we add values for all of the required fields. if ($entity_type_id == 'block_content') { $translation->info = $this->randomString(); diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php index 85a4b1a..478f74a 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php @@ -96,6 +96,9 @@ protected function getExpectedNormalizedEntity() { 'tid' => [ ['value' => 1], ], + 'revision_id' => [ + ['value' => 1], + ], 'uuid' => [ ['value' => $this->entity->uuid()], ], @@ -140,6 +143,21 @@ protected function getExpectedNormalizedEntity() { 'langcode' => 'en', ], ], + 'status' => [ + [ + 'value' => TRUE, + ] + ], + 'revision_created' => [ + $this->formatExpectedTimestampItemValues((int) $this->entity->getRevisionCreationTime()), + ], + 'revision_user' => [], + 'revision_log_message' => [], + 'revision_translation_affected' => [ + [ + 'value' => TRUE, + ], + ], ]; } diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php index 5907021..1c504f7 100644 --- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php +++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoBundle.php @@ -12,6 +12,7 @@ * entity_keys = { * "id" = "id", * "revision" = "revision_id", + * "label" = "name", * }, * admin_permission = "administer entity_test content", * links = { diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php index b8eac0a..aeb1bb2 100644 --- a/core/modules/taxonomy/src/Entity/Term.php +++ b/core/modules/taxonomy/src/Entity/Term.php @@ -2,8 +2,7 @@ namespace Drupal\taxonomy\Entity; -use Drupal\Core\Entity\ContentEntityBase; -use Drupal\Core\Entity\EntityChangedTrait; +use Drupal\Core\Entity\EditorialContentEntityBase; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Field\BaseFieldDefinition; @@ -31,14 +30,23 @@ * }, * base_table = "taxonomy_term_data", * data_table = "taxonomy_term_field_data", + * revision_table = "taxonomy_term_revision", + * revision_data_table = "taxonomy_term_field_revision", * uri_callback = "taxonomy_term_uri", * translatable = TRUE, * entity_keys = { * "id" = "tid", + * "revision" = "revision_id", * "bundle" = "vid", * "label" = "name", * "langcode" = "langcode", - * "uuid" = "uuid" + * "uuid" = "uuid", + * "published" = "status", + * }, + * revision_metadata_keys = { + * "revision_user" = "revision_user", + * "revision_created" = "revision_created", + * "revision_log_message" = "revision_log_message", * }, * bundle_entity_type = "taxonomy_vocabulary", * field_ui_base_route = "entity.taxonomy_vocabulary.overview_form", @@ -49,12 +57,13 @@ * "edit-form" = "/taxonomy/term/{taxonomy_term}/edit", * "create" = "/taxonomy/term", * }, - * permission_granularity = "bundle" + * permission_granularity = "bundle", + * constraints = { + * "TaxonomyHierarchy" = {} + * } * ) */ -class Term extends ContentEntityBase implements TermInterface { - - use EntityChangedTrait; +class Term extends EditorialContentEntityBase implements TermInterface { /** * {@inheritdoc} @@ -119,6 +128,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['name'] = BaseFieldDefinition::create('string') ->setLabel(t('Name')) ->setTranslatable(TRUE) + ->setRevisionable(TRUE) ->setRequired(TRUE) ->setSetting('max_length', 255) ->setDisplayOptions('view', [ @@ -135,6 +145,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['description'] = BaseFieldDefinition::create('text_long') ->setLabel(t('Description')) ->setTranslatable(TRUE) + ->setRevisionable(TRUE) ->setDisplayOptions('view', [ 'label' => 'hidden', 'type' => 'text_default', @@ -162,7 +173,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['changed'] = BaseFieldDefinition::create('changed') ->setLabel(t('Changed')) ->setDescription(t('The time that the term was last edited.')) - ->setTranslatable(TRUE); + ->setTranslatable(TRUE) + ->setRevisionable(TRUE); return $fields; } diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php index df80a47..10a5a87 100644 --- a/core/modules/taxonomy/src/Form/OverviewTerms.php +++ b/core/modules/taxonomy/src/Form/OverviewTerms.php @@ -2,6 +2,7 @@ namespace Drupal\taxonomy\Form; +use Drupal\Component\Utility\Unicode; use Drupal\Core\Access\AccessResult; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Form\FormBase; @@ -227,6 +228,44 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular } } + switch ($taxonomy_vocabulary->getHierarchy()) { + case VocabularyInterface::HIERARCHY_DISABLED: + $help_message = $this->t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', [ + '%capital_name' => Unicode::ucfirst($taxonomy_vocabulary->label()), + '%name' => $taxonomy_vocabulary->label() + ]); + break; + case VocabularyInterface::HIERARCHY_MULTIPLE: + $help_message = $this->t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', ['%capital_name' => Unicode::ucfirst($taxonomy_vocabulary->label())]); + break; + case VocabularyInterface::HIERARCHY_SINGLE: + default: + $help_message = $this->t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', [ + '%capital_name' => Unicode::ucfirst($taxonomy_vocabulary->label()), + '%name' => $taxonomy_vocabulary->label() + ]); + break; + } + + // Get IDs of terms which have pending revisions. + $pending_term_ids = $this->getTermsWithPendingRevisions($taxonomy_vocabulary); + if (!empty($pending_term_ids)) { + $help_message = $this->formatPlural( + count($pending_term_ids), + '%capital_name contains 1 term with pending revisions. Drag and drop of terms with pending revisions is not supported, but you can re-enable drag-and-drop support by getting each term to a published state.', + '%capital_name contains @count terms with pending revisions. Drag and drop of terms with pending revisions is not supported, but you can re-enable drag-and-drop support by getting each term to a published state.', + ['%capital_name' => Unicode::ucfirst($taxonomy_vocabulary->label())] + ); + } + + $form['help'] = [ + '#type' => 'container', + 'message' => ['#markup' => $help_message], + ]; + if (!empty($pending_term_ids) || $taxonomy_vocabulary->getHierarchy() === VocabularyInterface::HIERARCHY_MULTIPLE) { + $form['help']['#attributes']['class'] = ['messages', 'messages--warning']; + } + $errors = $form_state->getErrors(); $row_position = 0; // Build the actual form. @@ -267,7 +306,14 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular '#title' => $term->getName(), '#url' => $term->urlInfo(), ]; - if ($taxonomy_vocabulary->getHierarchy() != VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1) { + + // Add a special class for terms with pending revision so we can highlight + // them in the form. + if (in_array($term->id(), $pending_term_ids)) { + $form['terms'][$key]['#attributes']['class'][] = 'color-warning'; + } + + if ($taxonomy_vocabulary->getHierarchy() != VocabularyInterface::HIERARCHY_MULTIPLE && count($tree) > 1 && empty($pending_term_ids)) { $parent_fields = TRUE; $form['terms'][$key]['term']['tid'] = [ '#type' => 'hidden', @@ -316,7 +362,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular ]; } - $form['terms'][$key]['#attributes']['class'] = []; if ($parent_fields) { $form['terms'][$key]['#attributes']['class'][] = 'draggable'; } @@ -504,4 +549,29 @@ public function submitReset(array &$form, FormStateInterface $form_state) { $form_state->setRedirectUrl($vocabulary->urlInfo('reset-form')); } + /** + * Gets the terms with pending revisions from a vocabulary. + * + * @param \Drupal\taxonomy\VocabularyInterface $vocabulary + * A taxonomy vocabulary. + * + * @return array + * An array of term IDs which have pending revisions, keyed by revision IDs. + */ + protected function getTermsWithPendingRevisions(VocabularyInterface $vocabulary) { + $entity_type = $this->entityManager->getDefinition('taxonomy_term'); + + $query = $this->storageController->getQuery() + ->condition($entity_type->getKey('bundle'), $vocabulary->id(), '=') + ->sort($entity_type->getKey('revision'), 'DESC'); + $default_revisions = $query->execute(); + + $latest_revisions = (clone $query) + ->allRevisions() + ->execute(); + $latest_revisions = array_unique($latest_revisions); + + return array_diff_key($latest_revisions, $default_revisions); + } + } diff --git a/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraint.php b/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraint.php new file mode 100644 index 0000000..e09bedd --- /dev/null +++ b/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraint.php @@ -0,0 +1,26 @@ +published version of this term.'; + + /** + * {@inheritdoc} + */ + public function coversFields() { + return ['parent', 'weight']; + } + +} diff --git a/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraintValidator.php b/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraintValidator.php new file mode 100644 index 0000000..36e4d80 --- /dev/null +++ b/core/modules/taxonomy/src/Plugin/Validation/Constraint/TaxonomyHierarchyConstraintValidator.php @@ -0,0 +1,68 @@ +entityTypeManager = $entity_type_manager; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('entity_type.manager') + ); + } + + /** + * {@inheritdoc} + */ + public function validate($entity, Constraint $constraint) { + if ($entity && !$entity->isNew() && !$entity->isDefaultRevision()) { + /** @var \Drupal\taxonomy\TermStorageInterface $term_storage */ + $term_storage = $this->entityTypeManager->getStorage($entity->getEntityTypeId()); + + $new_parents = array_column($entity->parent->getValue(), 'target_id'); + $original_parents = array_keys($term_storage->loadParents($entity->id())) ?: [0]; + if ($new_parents != $original_parents) { + $this->context->buildViolation($constraint->message) + ->atPath('parent') + ->addViolation(); + } + + /** @var \Drupal\Core\Entity\ContentEntityInterface $original */ + $original = $term_storage->loadUnchanged($entity->id()); + if (!$entity->weight->equals($original->weight)) { + $this->context->buildViolation($constraint->message) + ->atPath('weight') + ->addViolation(); + } + } + } + +} diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php index 6de48e0..20e8dc0 100644 --- a/core/modules/taxonomy/src/TermForm.php +++ b/core/modules/taxonomy/src/TermForm.php @@ -3,6 +3,7 @@ namespace Drupal\taxonomy; use Drupal\Core\Entity\ContentEntityForm; +use Drupal\Core\Entity\EntityConstraintViolationListInterface; use Drupal\Core\Form\FormStateInterface; /** @@ -123,6 +124,28 @@ public function buildEntity(array $form, FormStateInterface $form_state) { /** * {@inheritdoc} */ + protected function getEditedFieldNames(FormStateInterface $form_state) { + return array_merge(['parent', 'weight'], parent::getEditedFieldNames($form_state)); + } + + /** + * {@inheritdoc} + */ + protected function flagViolations(EntityConstraintViolationListInterface $violations, array $form, FormStateInterface $form_state) { + // Manually flag violations of fields not handled by the form display. + foreach ($violations->getByField('parent') as $violation) { + $form_state->setErrorByName('parent', $violation->getMessage()); + } + foreach ($violations->getByField('weight') as $violation) { + $form_state->setErrorByName('weight', $violation->getMessage()); + } + + parent::flagViolations($violations, $form, $form_state); + } + + /** + * {@inheritdoc} + */ public function save(array $form, FormStateInterface $form_state) { $term = $this->entity; diff --git a/core/modules/taxonomy/src/TermStorageSchema.php b/core/modules/taxonomy/src/TermStorageSchema.php index 5bcb088..822d1f4 100644 --- a/core/modules/taxonomy/src/TermStorageSchema.php +++ b/core/modules/taxonomy/src/TermStorageSchema.php @@ -17,7 +17,7 @@ class TermStorageSchema extends SqlContentEntityStorageSchema { protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) { $schema = parent::getEntitySchema($entity_type, $reset = FALSE); - $schema['taxonomy_term_field_data']['indexes'] += [ + $schema[$entity_type->getDataTable()]['indexes'] += [ 'taxonomy_term__tree' => ['vid', 'weight', 'name'], 'taxonomy_term__vid_name' => ['vid', 'name'], ]; diff --git a/core/modules/taxonomy/src/Tests/Update/TaxonomyUpdateTest.php b/core/modules/taxonomy/src/Tests/Update/TaxonomyUpdateTest.php new file mode 100644 index 0000000..e664e75 --- /dev/null +++ b/core/modules/taxonomy/src/Tests/Update/TaxonomyUpdateTest.php @@ -0,0 +1,75 @@ +databaseDumpFiles = [ + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz', + ]; + } + + /** + * Tests the conversion of taxonomy terms to be revisionable and publishable. + * + * @see taxonomy_update_8400() + * @see taxonomy_post_update_make_taxonomy_term_revisionable() + */ + public function testConversionToRevisionableAndPublishable() { + $this->runUpdates(); + + // Log in as user 1. + $account = User::load(1); + $account->pass_raw = 'drupal'; + $this->drupalLogin($account); + + // Make sure our vocabulary exists. + $this->drupalGet('admin/structure/taxonomy/manage/test_vocabulary/overview'); + + // Make sure our terms exist. + $this->assertText('Test root term'); + $this->assertText('Test child term'); + $this->drupalGet('taxonomy/term/3'); + $this->assertResponse('200'); + + // Make sure the terms are still translated. + $this->drupalGet('taxonomy/term/2/translations'); + $this->assertLink('Test root term - Spanish'); + + // Check that taxonomy terms can be created, saved and then loaded. + $storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term'); + /** @var \Drupal\taxonomy\Entity\Term $term */ + $term = $storage->create([ + 'name' => 'Test term', + 'vid' => 'article', + ]); + $term->save(); + + $storage->resetCache(); + $term = $storage->loadRevision($term->getRevisionId()); + + $this->assertEqual('Test term', $term->label()); + $this->assertEqual('article', $term->bundle()); + $this->assertTrue($term->isPublished()); + } + + /** + * {@inheritdoc} + */ + protected function replaceUser1() { + // Do not replace the user from our dump. + } + +} diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install new file mode 100644 index 0000000..991f40b --- /dev/null +++ b/core/modules/taxonomy/taxonomy.install @@ -0,0 +1,114 @@ +moduleExists('content_translation')) { + $dependencies['taxonomy'][8400] = [ + 'content_translation' => 8400, + ]; + + return $dependencies; + } +} + +/** + * Add the 'published' and revisionable metadata fields to taxonomy terms. + */ +function taxonomy_update_8400() { + $definition_update_manager = \Drupal::entityDefinitionUpdateManager(); + + // Add the published entity key and revisionable metadata fields to the + // taxonomy_term entity type. + $entity_type = $definition_update_manager->getEntityType('taxonomy_term'); + + $entity_keys = $entity_type->getKeys(); + $entity_keys['published'] = 'status'; + $entity_type->set('entity_keys', $entity_keys); + + $revision_metadata_keys = [ + 'revision_user' => 'revision_user', + 'revision_created' => 'revision_created', + 'revision_log_message' => 'revision_log_message' + ]; + $entity_type->set('revision_metadata_keys', $revision_metadata_keys); + + $definition_update_manager->updateEntityType($entity_type); + + // Add the status field. + $status = BaseFieldDefinition::create('boolean') + ->setLabel(t('Publishing status')) + ->setDescription(t('A boolean indicating the published state.')) + ->setRevisionable(TRUE) + ->setTranslatable(TRUE) + ->setDefaultValue(TRUE); + + $has_content_translation_status_field = \Drupal::moduleHandler()->moduleExists('content_translation') && $definition_update_manager->getFieldStorageDefinition('content_translation_status', 'taxonomy_term'); + if ($has_content_translation_status_field) { + $status->setInitialValueFromField('content_translation_status'); + } + else { + $status->setInitialValue(TRUE); + } + $definition_update_manager->installFieldStorageDefinition('status', 'taxonomy_term', 'taxonomy_term', $status); + + // Add the revision metadata fields. + $revision_created = BaseFieldDefinition::create('created') + ->setLabel(t('Revision create time')) + ->setDescription(t('The time that the current revision was created.')) + ->setRevisionable(TRUE); + $definition_update_manager->installFieldStorageDefinition('revision_created', 'taxonomy_term', 'taxonomy_term', $revision_created); + + $revision_user = BaseFieldDefinition::create('entity_reference') + ->setLabel(t('Revision user')) + ->setDescription(t('The user ID of the author of the current revision.')) + ->setSetting('target_type', 'user') + ->setRevisionable(TRUE); + $definition_update_manager->installFieldStorageDefinition('revision_user', 'taxonomy_term', 'taxonomy_term', $revision_user); + + $revision_log_message = BaseFieldDefinition::create('string_long') + ->setLabel(t('Revision log message')) + ->setDescription(t('Briefly describe the changes you have made.')) + ->setRevisionable(TRUE) + ->setDefaultValue('') + ->setDisplayOptions('form', [ + 'type' => 'string_textarea', + 'weight' => 25, + 'settings' => [ + 'rows' => 4, + ], + ]); + $definition_update_manager->installFieldStorageDefinition('revision_log_message', 'taxonomy_term', 'taxonomy_term', $revision_log_message); + + // Uninstall the 'content_translation_status' field if needed. + $database = \Drupal::database(); + if ($has_content_translation_status_field) { + // First we have to remove the field data. + $database->update($entity_type->getDataTable()) + ->fields(['content_translation_status' => NULL]) + ->execute(); + + // A site may have disabled revisionability for this entity type. + if ($entity_type->isRevisionable()) { + $database->update($entity_type->getRevisionDataTable()) + ->fields(['content_translation_status' => NULL]) + ->execute(); + } + + $content_translation_status = $definition_update_manager->getFieldStorageDefinition('content_translation_status', 'taxonomy_term'); + $definition_update_manager->uninstallFieldStorageDefinition($content_translation_status); + } + + return t('Taxonomy terms have been converted to revisionable and publishable.'); +} diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index be8532a..bd3bafa 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -6,7 +6,6 @@ */ use Drupal\Component\Utility\Tags; -use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\Sql\SqlContentEntityStorage; use Drupal\Core\Render\Element; @@ -78,29 +77,6 @@ function taxonomy_help($route_name, RouteMatchInterface $route_match) { case 'entity.taxonomy_vocabulary.collection': $output = '

' . t('Taxonomy is for categorizing content. Terms are grouped into vocabularies. For example, a vocabulary called "Fruit" would contain the terms "Apple" and "Banana".') . '

'; return $output; - - case 'entity.taxonomy_vocabulary.overview_form': - $vocabulary = $route_match->getParameter('taxonomy_vocabulary'); - if (\Drupal::currentUser()->hasPermission('administer taxonomy') || \Drupal::currentUser()->hasPermission('edit terms in ' . $vocabulary->id())) { - switch ($vocabulary->getHierarchy()) { - case VocabularyInterface::HIERARCHY_DISABLED: - return '

' . t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', ['%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label()]) . '

'; - case VocabularyInterface::HIERARCHY_SINGLE: - return '

' . t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', ['%capital_name' => Unicode::ucfirst($vocabulary->label()), '%name' => $vocabulary->label()]) . '

'; - case VocabularyInterface::HIERARCHY_MULTIPLE: - return '

' . t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', ['%capital_name' => Unicode::ucfirst($vocabulary->label())]) . '

'; - } - } - else { - switch ($vocabulary->getHierarchy()) { - case VocabularyInterface::HIERARCHY_DISABLED: - return '

' . t('%capital_name contains the following terms.', ['%capital_name' => Unicode::ucfirst($vocabulary->label())]) . '

'; - case VocabularyInterface::HIERARCHY_SINGLE: - return '

' . t('%capital_name contains terms grouped under parent terms', ['%capital_name' => Unicode::ucfirst($vocabulary->label())]) . '

'; - case VocabularyInterface::HIERARCHY_MULTIPLE: - return '

' . t('%capital_name contains terms with multiple parents.', ['%capital_name' => Unicode::ucfirst($vocabulary->label())]) . '

'; - } - } } } diff --git a/core/modules/taxonomy/taxonomy.post_update.php b/core/modules/taxonomy/taxonomy.post_update.php new file mode 100644 index 0000000..945da8f --- /dev/null +++ b/core/modules/taxonomy/taxonomy.post_update.php @@ -0,0 +1,31 @@ +convertToRevisionable( + $sandbox, + [ + 'name', + 'description', + 'changed', + ] + ); +} diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php new file mode 100644 index 0000000..983f8f8 --- /dev/null +++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php @@ -0,0 +1,152 @@ +drupalLogin($this->drupalCreateUser(['administer taxonomy', 'use editorial transition create_new_draft', 'use editorial transition publish'])); + + // Create a vocabulary. + $this->vocabulary = $this->createVocabulary(); + + // Set the vocabulary as moderated. + $workflow = Workflow::load('editorial'); + $workflow->getTypePlugin()->addEntityTypeAndBundle('taxonomy_term', $this->vocabulary->id()); + $workflow->save(); + } + + /** + * Tests taxonomy term parents on a moderated vocabulary. + */ + public function testTaxonomyTermParents() { + // Create a simple hierarchy in the vocabulary, a root term and three parent + // terms. + $root = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published']); + $parent_1 = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published', 'parent' => $root->id()]); + $parent_2 = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published', 'parent' => $root->id()]); + $parent_3 = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published', 'parent' => $root->id()]); + + // Create a child term and assign one of the parents above. + $child = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published', 'parent' => $parent_1->id()]); + + $taxonomy_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term'); + $validation_message = 'You can only change the taxonomy hierarchy for the published version of this term.'; + + // Add a pending revision without changing the term parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, ['moderation_state[0][state]' => 'draft'], 'Save'); + + $this->assertSession()->pageTextNotContains($validation_message); + + // Add a pending revision and change the parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'parent[]' => [$parent_2->id()], + 'moderation_state[0][state]' => 'draft', + ], 'Save'); + + // Check that parents were not changed. + $this->assertSession()->pageTextContains($validation_message); + $taxonomy_storage->resetCache(); + $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id()))); + + // Add a pending revision and add a new parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'parent[]' => [$parent_1->id(), $parent_3->id()], + 'moderation_state[0][state]' => 'draft', + ], 'Save'); + + // Check that parents were not changed. + $this->assertSession()->pageTextContains($validation_message); + $taxonomy_storage->resetCache(); + $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id()))); + + // Add a pending revision and use the root term as a parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'parent[]' => [$root->id()], + 'moderation_state[0][state]' => 'draft', + ], 'Save'); + + // Check that parents were not changed. + $this->assertSession()->pageTextContains($validation_message); + $taxonomy_storage->resetCache(); + $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id()))); + + // Add a pending revision and remove the parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'parent[]' => [], + 'moderation_state[0][state]' => 'draft', + ], 'Save'); + + // Check that parents were not changed. + $this->assertSession()->pageTextContains($validation_message); + $taxonomy_storage->resetCache(); + $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id()))); + + // Add a published revision and change the parent. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'parent[]' => [$parent_2->id()], + 'moderation_state[0][state]' => 'published', + ], 'Save'); + + // Check that parents were changed. + $this->assertSession()->pageTextNotContains($validation_message); + $taxonomy_storage->resetCache(); + $this->assertEquals([$parent_2->id()], array_keys($taxonomy_storage->loadParents($child->id()))); + + // Add a pending revision and change the weight. + $this->drupalGet('taxonomy/term/' . $child->id() . '/edit'); + $this->drupalPostForm(NULL, [ + 'weight' => 10, + 'moderation_state[0][state]' => 'draft', + ], 'Save'); + + // Check that weight was not changed. + $this->assertSession()->pageTextContains($validation_message); + + // Add a new term without any parent and publish it. + $edit = [ + 'name[0][value]' => $this->randomMachineName(), + 'moderation_state[0][state]' => 'published', + ]; + $this->drupalPostForm("admin/structure/taxonomy/manage/{$this->vocabulary->id()}/add", $edit, 'Save'); + // Add a pending revision without any changes. + $terms = taxonomy_term_load_multiple_by_name($edit['name[0][value]']); + $term = reset($terms); + $this->drupalPostForm('taxonomy/term/' . $term->id() . '/edit', ['moderation_state[0][state]' => 'draft'], 'Save'); + $this->assertSession()->pageTextNotContains($validation_message); + } + +}