From adeb796cc9ae2a9b62bc374309e4cbdce269a911 Mon Sep 17 00:00:00 2001
From: anuar <anuar.alfetahe@adm.ee>
Date: Wed, 11 Aug 2021 12:55:40 +0300
Subject: [PATCH] Workbench moderation definitions fix

---
 /workbench_moderation.module   |  2 +-
 .../src/Plugin/Action/ModerationOptOutPublishNode.php        | 5 -----
 .../src/Plugin/Action/ModerationOptOutUnpublishNode.php      | 5 -----
 3 files changed, 1 insertions(+), 11 deletion(-)

diff --git a/workbench_moderation.module b/workbench_moderation.module
index bd5a47a..63802b3 100644
--- a/workbench_moderation.module
+++ b/workbench_moderation.module
@@ -218,7 +218,7 @@ function workbench_moderation_action_info_alter(&$definitions) {
     $definitions['entity:publish_action:node']['class'] = ModerationOptOutPublishNode::class;
   }
   if (isset($definitions['entity:unpublish_action:node']['class']) && $definitions['entity:unpublish_action:node']['class'] == UnpublishAction::class) {
-    $definitions['entity:publish_action:node']['class'] = ModerationOptOutUnpublishNode::class;
+    $definitions['entity:unpublish_action:node']['class'] = ModerationOptOutUnpublishNode::class;
   }
 }

diff --git a/src/Plugin/Action/ModerationOptOutPublishNode.php b/src/Plugin/Action/ModerationOptOutPublishNode.php
index 5b3519c..a99655c 100644
--- a/src/Plugin/Action/ModerationOptOutPublishNode.php
+++ b/src/Plugin/Action/ModerationOptOutPublishNode.php
@@ -42,11 +42,6 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    if ($entity && $this->moderationInfo->isModeratableEntity($entity)) {
-      $this->messenger()->addMessage($this->t('One or more entities were skipped as they are under moderation and may not be directly published or unpublished.'));
-      return;
-    }
-
     parent::execute($entity);
   }

diff --git a/src/Plugin/Action/ModerationOptOutUnpublishNode.php b/src/Plugin/Action/ModerationOptOutUnpublishNode.php
index b2d728f..44c36cb 100644
--- a/src/Plugin/Action/ModerationOptOutUnpublishNode.php
+++ b/src/Plugin/Action/ModerationOptOutUnpublishNode.php
@@ -42,11 +42,6 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function execute($entity = NULL) {
-    if ($entity && $this->moderationInfo->isModeratableEntity($entity)) {
-      $this->messenger()->addMessage($this->t('One or more entities were skipped as they are under moderation and may not be directly published or unpublished.'));
-      return;
-    }
-
     parent::execute($entity);
   }

--
2.25.1
