diff --git a/core/modules/content_moderation/src/EntityTypeInfo.php b/core/modules/content_moderation/src/EntityTypeInfo.php index f11e471..dbe31f4 100644 --- a/core/modules/content_moderation/src/EntityTypeInfo.php +++ b/core/modules/content_moderation/src/EntityTypeInfo.php @@ -361,6 +361,14 @@ public function formAlter(array &$form, FormStateInterface $form_state, $form_id ->enforceRevisionsEntityFormAlter($form, $form_state, $form_id); // Submit handler to redirect to the latest version, if available. $form['actions']['submit']['#submit'][] = [EntityTypeInfo::class, 'bundleFormRedirect']; + // Hide the default buttons, including the specialty ones added by + // NodeForm. + foreach (['publish', 'unpublish'] as $key) { + $form['actions'][$key]['#access'] = FALSE; + unset($form['actions'][$key]['#dropbutton']); + } + // Give access to submit, because Node disables it. + $form['actions']['submit']['#access'] = TRUE; } } } diff --git a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php index 7fe5a6d..3a4e478 100644 --- a/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php +++ b/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php @@ -132,7 +132,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen // @todo https://www.drupal.org/node/2779933 write a test for this. $element += [ - '#access' => FALSE, '#type' => 'select', '#options' => $target_states, '#default_value' => $default->id(), @@ -141,12 +140,18 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen ]; $element['#element_validate'][] = array(get_class($this), 'validateElement'); - // Use the dropbutton. - $element['#process'][] = [get_called_class(), 'processActions']; return $element; } /** + * {@inheritdoc} + */ + public static function validateElement(array $element, FormStateInterface $form_state) { + $form_state->setValueForElement($element, [$element['#key_column'] => $element['#value']]); + } + + + /** * Entity builder updating the node moderation state with the submitted value. * * @param string $entity_type_id @@ -166,50 +171,6 @@ public static function updateStatus($entity_type_id, ContentEntityInterface $ent } /** - * Process callback to alter action buttons. - */ - public static function processActions($element, FormStateInterface $form_state, array &$form) { - - // We'll steal most of the button configuration from the default submit - // button. However, NodeForm also hides that button for admins (as it adds - // its own, too), so we have to restore it. - $default_button = $form['actions']['submit']; - $default_button['#access'] = TRUE; - - // Add a custom button for each transition we're allowing. The #dropbutton - // property tells FAPI to cluster them all together into a single widget. - $options = $element['#options']; - - $entity = $form_state->getFormObject()->getEntity(); - $translatable = !$entity->isNew() && $entity->isTranslatable(); - foreach ($options as $id => $label) { - $button = [ - '#dropbutton' => 'save', - '#moderation_state' => $id, - '#weight' => -10, - ]; - - $button['#value'] = $translatable - ? t('Save and @transition (this translation)', ['@transition' => $label]) - : t('Save and @transition', ['@transition' => $label]); - - $form['actions']['moderation_state_' . $id] = $button + $default_button; - } - - // Hide the default buttons, including the specialty ones added by - // NodeForm. - foreach (['publish', 'unpublish', 'submit'] as $key) { - $form['actions'][$key]['#access'] = FALSE; - unset($form['actions'][$key]['#dropbutton']); - } - - // Setup a callback to translate the button selection back into field - // widget, so that it will get saved properly. - $form['#entity_builders']['update_moderation_state'] = [get_called_class(), 'updateStatus']; - return $element; - } - - /** * {@inheritdoc} */ public static function isApplicable(FieldDefinitionInterface $field_definition) { diff --git a/core/modules/content_moderation/src/Tests/ModerationFormTest.php b/core/modules/content_moderation/src/Tests/ModerationFormTest.php index 16da4e4..caa5380 100644 --- a/core/modules/content_moderation/src/Tests/ModerationFormTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationFormTest.php @@ -34,7 +34,8 @@ public function testModerationForm() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'Some moderated content', 'body[0][value]' => 'First version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft', + ], t('Save')); $node = $this->drupalGetNodeByTitle('Some moderated content'); $canonical_path = sprintf('node/%d', $node->id()); @@ -51,7 +52,8 @@ public function testModerationForm() { // Update the draft. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Second version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft', + ], t('Save')); // The latest version page should not show, because there is still no // forward revision. @@ -61,7 +63,8 @@ public function testModerationForm() { // Publish the draft. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Third version of the content.', - ], t('Save and Publish')); + 'moderation_state[0]' => 'published', + ], t('Save')); // The published view should not have a moderation form, because it is the // default revision. @@ -77,7 +80,8 @@ public function testModerationForm() { // Make a forward revision. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Fourth version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft', + ], t('Save')); // The published view should not have a moderation form, because it is the // default revision. diff --git a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php b/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php index a78c104..45c8918 100644 --- a/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationLocaleTest.php @@ -53,8 +53,9 @@ public function testTranslateModeratedContent() { $edit = [ 'title[0][value]' => 'Published English node', 'langcode[0][value]' => 'en', + 'moderation_state[0]' => 'published' ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Publish')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article Published English node has been created.')); $english_node = $this->drupalGetNodeByTitle('Published English node'); @@ -63,8 +64,9 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'French node Draft', + 'moderation_state[0]' => 'draft' ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); // Here the error has occurred "The website encountered an unexpected error. // Please try again later." // If the translation has got lost. @@ -74,8 +76,9 @@ public function testTranslateModeratedContent() { $edit = [ 'title[0][value]' => 'English node', 'langcode[0][value]' => 'en', + 'moderation_state[0]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article English node has been created.')); $english_node = $this->drupalGetNodeByTitle('English node'); @@ -84,14 +87,17 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'French node', + 'moderation_state[0]' => 'draft' ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $this->assertText(t('Article French node has been updated.')); $english_node = $this->drupalGetNodeByTitle('English node', TRUE); // Publish the English article and check that the translation stays // unpublished. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article English node has been updated.')); $english_node = $this->drupalGetNodeByTitle('English node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -106,8 +112,9 @@ public function testTranslateModeratedContent() { // the translation first. $edit = [ 'title[0][value]' => 'Another node', + 'moderation_state[0]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article Another node has been created.')); $english_node = $this->drupalGetNodeByTitle('Another node'); @@ -116,14 +123,17 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'Translated node', + 'moderation_state[0]' => 'draft', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $this->assertText(t('Article Translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); // Publish the translation and check that the source language version stays // unpublished. - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article Translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -135,8 +145,9 @@ public function testTranslateModeratedContent() { // Now check that we can create a new draft of the translation. $edit = [ 'title[0][value]' => 'New draft of translated node', + 'moderation_state[0]' => 'draft', ]; - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and Create New Draft (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save (this translation)')); $this->assertText(t('Article New draft of translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -157,15 +168,21 @@ public function testTranslateModeratedContent() { $this->assertEqual($french_node->getTitle(), 'New draft of translated node', 'The draft has replaced the published revision.'); // Publish the English article before testing the archive transition. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'published', + ], t('Save (this translation)')); $this->assertText(t('Article Another node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $this->assertEqual($english_node->moderation_state->value, 'published'); // Archive the node and its translation. - $this->drupalPostForm('node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)')); + $this->drupalPostForm('node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'archived', + ], t('Save (this translation)')); $this->assertText(t('Article Another node has been updated.')); - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Archive (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'archived', + ], t('Save (this translation)')); $this->assertText(t('Article New draft of translated node has been updated.')); $english_node = $this->drupalGetNodeByTitle('Another node', TRUE); $french_node = $english_node->getTranslation('fr'); @@ -178,8 +195,9 @@ public function testTranslateModeratedContent() { // after creating a forward french revision. $edit = [ 'title[0][value]' => 'An english node', + 'moderation_state[0]' => 'draft', ]; - $this->drupalPostForm('node/add/article', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('node/add/article', $edit, t('Save')); $this->assertText(t('Article An english node has been created.')); $english_node = $this->drupalGetNodeByTitle('An english node'); $this->assertFalse($english_node->isPublished()); @@ -189,15 +207,18 @@ public function testTranslateModeratedContent() { $this->clickLink(t('Add')); $edit = [ 'title[0][value]' => 'A french node', + 'moderation_state[0]' => 'published', ]; - $this->drupalPostForm(NULL, $edit, t('Save and Publish (this translation)')); + $this->drupalPostForm(NULL, $edit, t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); $this->assertFalse($english_node->isPublished()); // Create a forward revision - $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [], t('Save and Create New Draft (this translation)')); + $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'draft', + ], t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); @@ -205,7 +226,9 @@ public function testTranslateModeratedContent() { // Publish the english node and the default french node not the latest // french node should be used. - $this->drupalPostForm('/node/' . $english_node->id() . '/edit', [], t('Save and Publish (this translation)')); + $this->drupalPostForm('/node/' . $english_node->id() . '/edit', [ + 'moderation_state[0]' => 'published', + ], t('Save (this translation)')); $english_node = $this->drupalGetNodeByTitle('An english node', TRUE); $french_node = $english_node->getTranslation('fr'); $this->assertTrue($french_node->isPublished()); diff --git a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php b/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php index e42f536..9990f60 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationStateBlockTest.php @@ -67,9 +67,10 @@ public function testCustomBlockModeration() { $body = 'Body of moderated block'; $edit = [ 'info[0][value]' => 'Moderated block', + 'moderation_state[0]' => 'draft', 'body[0][value]' => $body, ]; - $this->drupalPostForm('block/add', $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/add', $edit, t('Save')); $this->assertText(t('basic Moderated block has been created.')); // Place the block in the Sidebar First region. @@ -91,8 +92,9 @@ public function testCustomBlockModeration() { $updated_body = 'This is the new body value'; $edit = [ 'body[0][value]' => $updated_body, + 'moderation_state[0]' => 'draft' ]; - $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/' . $block->id(), $edit, t('Save')); $this->assertText(t('basic Moderated block has been updated.')); // Navigate to the home page and check that the block shows the updated @@ -102,14 +104,17 @@ public function testCustomBlockModeration() { $this->assertText($updated_body); // Publish the block so we can create a forward revision. - $this->drupalPostForm('block/' . $block->id(), [], t('Save and Publish')); + $this->drupalPostForm('block/' . $block->id(), [ + 'moderation_state[0]' => 'published' + ], t('Save')); // Create a forward revision. $forward_revision_body = 'This is the forward revision body value'; $edit = [ 'body[0][value]' => $forward_revision_body, + 'moderation_state[0]' => 'draft' ]; - $this->drupalPostForm('block/' . $block->id(), $edit, t('Save and Create New Draft')); + $this->drupalPostForm('block/' . $block->id(), $edit, t('Save')); $this->assertText(t('basic Moderated block has been updated.')); // Navigate to home page and check that the forward revision doesn't show, diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php b/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php index a89ec9f..a04932a 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationStateNodeTest.php @@ -29,7 +29,8 @@ protected function setUp() { public function testCreatingContent() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'moderated content', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); $node = $this->getNodeByTitle('moderated content'); if (!$node) { $this->fail('Test node was not saved correctly.'); @@ -38,7 +39,9 @@ public function testCreatingContent() { $path = 'node/' . $node->id() . '/edit'; // Set up published revision. - $this->drupalPostForm($path, [], t('Save and Publish')); + $this->drupalPostForm($path, [ + 'moderation_state[0]' => 'published' + ], t('Save')); \Drupal::entityTypeManager()->getStorage('node')->resetCache([$node->id()]); /* @var \Drupal\node\NodeInterface $node */ $node = \Drupal::entityTypeManager()->getStorage('node')->load($node->id()); @@ -96,7 +99,8 @@ public function testFormSaveDestination() { $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'Some moderated content', 'body[0][value]' => 'First version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); $node = $this->drupalGetNodeByTitle('Some moderated content'); $edit_path = sprintf('node/%d/edit', $node->id()); @@ -110,7 +114,8 @@ public function testFormSaveDestination() { // URL, but viewing the second revision. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Second version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()])); $this->assertText('Second version of the content.'); @@ -118,7 +123,8 @@ public function testFormSaveDestination() { // canonical URL. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Third version of the content.', - ], t('Save and Publish')); + 'moderation_state[0]' => 'published' + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.canonical', ['node' => $node->id()])); $this->assertText('Third version of the content.'); @@ -126,7 +132,8 @@ public function testFormSaveDestination() { // version" tab. $this->drupalPostForm($edit_path, [ 'body[0][value]' => 'Fourth version of the content.', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); $this->assertUrl(Url::fromRoute('entity.node.latest_version', ['node' => $node->id()])); $this->assertText('Fourth version of the content.'); } diff --git a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php index 099b4dc..f0dd6cc 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationStateNodeTypeTest.php @@ -67,8 +67,8 @@ public function testEnablingOnExistingContent() { $this->assertLinkByHref('node/' . $node->id() . '/edit'); $this->drupalGet('node/' . $node->id() . '/edit'); $this->assertResponse(200); - $this->assertRaw('Save and Create New Draft'); - $this->assertNoRaw('Save and publish'); + $this->assertRaw('Create New Draft'); + $this->assertRaw('Publish'); } } diff --git a/core/modules/content_moderation/src/Tests/NodeAccessTest.php b/core/modules/content_moderation/src/Tests/NodeAccessTest.php index 7392a7e..f44d234 100644 --- a/core/modules/content_moderation/src/Tests/NodeAccessTest.php +++ b/core/modules/content_moderation/src/Tests/NodeAccessTest.php @@ -28,7 +28,8 @@ public function testPageAccess() { // Create a node to test with. $this->drupalPostForm('node/add/moderated_content', [ 'title[0][value]' => 'moderated content', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); $node = $this->getNodeByTitle('moderated content'); if (!$node) { $this->fail('Test node was not saved correctly.'); @@ -39,7 +40,9 @@ public function testPageAccess() { $latest_path = 'node/' . $node->id() . '/latest'; // Publish the node. - $this->drupalPostForm($edit_path, [], t('Save and Publish')); + $this->drupalPostForm($edit_path, [ + 'moderation_state[0]' => 'published' + ], t('Save')); // Ensure access works correctly for anonymous users. $this->drupalLogout(); @@ -56,7 +59,8 @@ public function testPageAccess() { $this->drupalLogin($this->adminUser); $this->drupalPostForm($edit_path, [ 'title[0][value]' => 'moderated content revised', - ], t('Save and Create New Draft')); + 'moderation_state[0]' => 'draft' + ], t('Save')); // Now make a new user and verify that the new user's access is correct. $user = $this->createUser([