summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Rowlands2017-07-28 00:55:46 (GMT)
committerLee Rowlands2017-07-28 00:55:46 (GMT)
commite7d43505b22b8a9067bbadc4bd249c75db5bf827 (patch)
tree0441fdcb7db55509ed58610a12f3a329a5878f4d
parent6fb8ad45d62dd1a3c5c75442fcf79d288c05b5ad (diff)
Revert "Issue #2894499 by amateescu, Manuel Garcia, xjm: Rename 'Editorial workflow' to 'Editorial'"
This reverts commit 6fb8ad45d62dd1a3c5c75442fcf79d288c05b5ad.
-rw-r--r--core/modules/content_moderation/config/install/workflows.workflow.editorial.yml2
-rw-r--r--core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php2
-rw-r--r--core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php2
-rw-r--r--core/modules/workflows/src/Form/WorkflowEditForm.php2
4 files changed, 3 insertions, 5 deletions
diff --git a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
index 455d3fc..8ebd827 100644
--- a/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
+++ b/core/modules/content_moderation/config/install/workflows.workflow.editorial.yml
@@ -4,7 +4,7 @@ dependencies:
module:
- content_moderation
id: editorial
-label: 'Editorial'
+label: 'Editorial workflow'
type: content_moderation
type_settings:
states:
diff --git a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
index 7f7c756..eebb066 100644
--- a/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
+++ b/core/modules/content_moderation/src/Plugin/Validation/Constraint/ModerationStateConstraint.php
@@ -15,6 +15,6 @@ use Symfony\Component\Validator\Constraint;
class ModerationStateConstraint extends Constraint {
public $message = 'Invalid state transition from %from to %to';
- public $invalidStateMessage = 'State %state does not exist on %workflow workflow';
+ public $invalidStateMessage = 'State %state does not exist on %workflow';
}
diff --git a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
index b10f1e5..c8ce61b 100644
--- a/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/EntityStateChangeValidationTest.php
@@ -116,7 +116,7 @@ class EntityStateChangeValidationTest extends KernelTestBase {
$violations = $node->validate();
$this->assertCount(1, $violations);
- $this->assertEquals('State <em class="placeholder">invalid_state</em> does not exist on <em class="placeholder">Editorial</em> workflow', $violations->get(0)->getMessage());
+ $this->assertEquals('State <em class="placeholder">invalid_state</em> does not exist on <em class="placeholder">Editorial workflow</em>', $violations->get(0)->getMessage());
}
/**
diff --git a/core/modules/workflows/src/Form/WorkflowEditForm.php b/core/modules/workflows/src/Form/WorkflowEditForm.php
index 9a224eb..764c0c9 100644
--- a/core/modules/workflows/src/Form/WorkflowEditForm.php
+++ b/core/modules/workflows/src/Form/WorkflowEditForm.php
@@ -24,8 +24,6 @@ class WorkflowEditForm extends EntityForm {
/* @var \Drupal\workflows\WorkflowInterface $workflow */
$workflow = $this->entity;
- $form['#title'] = $this->t('Edit %label workflow', ['%label' => $workflow->label()]);
-
$form['label'] = [
'#type' => 'textfield',
'#title' => $this->t('Label'),