Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / workflows / src / Form / WorkflowStateEditForm.php

diff --git a/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
index bba3b11c13493d3cb2c484e846195c876fd6bda0..0ecc3cde6beda57ec609112f5da85d7b973a871d 100644 (file)
--- a/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
+++ b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
@@ -121,14 +121,14 @@ class WorkflowStateEditForm extends EntityForm {
         'title' => $this->t('Edit'),
         'url' => Url::fromRoute('entity.workflow.edit_transition_form', [
           'workflow' => $workflow->id(),
-          'workflow_transition' => $transition->id()
+          'workflow_transition' => $transition->id(),
         ]),
       ];
       $links['delete'] = [
         'title' => t('Delete'),
         'url' => Url::fromRoute('entity.workflow.delete_transition_form', [
           'workflow' => $workflow->id(),
-          'workflow_transition' => $transition->id()
+          'workflow_transition' => $transition->id(),
         ]),
       ];
       $form['transitions'][$transition->id()] = [
@@ -161,6 +161,10 @@ class WorkflowStateEditForm extends EntityForm {
    *   The current state of the form.
    */
   protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+    if (!$form_state->isValidationComplete()) {
+      // Only do something once form validation is complete.
+      return;
+    }
     /** @var \Drupal\workflows\WorkflowInterface $entity */
     $values = $form_state->getValues();
     $entity->getTypePlugin()->setStateLabel($values['id'], $values['label']);
@@ -201,7 +205,7 @@ class WorkflowStateEditForm extends EntityForm {
     }
 
     $workflow->save();
-    drupal_set_message($this->t('Saved %label state.', [
+    $this->messenger()->addStatus($this->t('Saved %label state.', [
       '%label' => $workflow->getTypePlugin()->getState($this->stateId)->label(),
     ]));
     $form_state->setRedirectUrl($workflow->toUrl('edit-form'));
@@ -226,8 +230,8 @@ class WorkflowStateEditForm extends EntityForm {
       ],
       '#url' => Url::fromRoute('entity.workflow.delete_state_form', [
         'workflow' => $this->entity->id(),
-        'workflow_state' => $this->stateId
-      ])
+        'workflow_state' => $this->stateId,
+      ]),
     ];
 
     return $actions;