From 769d6ef1e406168c3e7d12b208a4515bd2969331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= <jurij@kompot.si>
Date: Thu, 11 Apr 2024 20:16:06 +0200
Subject: [PATCH] Boljsi msg za revizije, dodan avtor spremembe

---
 ...ifications.content_moderation_notification.nov_osnutek.yml | 2 +-
 .../yufu_concept/src/Plugin/rest/resource/AddConcept.php      | 4 +---
 web/modules/custom/yufu_concept/yufu_concept.module           | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/sync/content_moderation_notifications.content_moderation_notification.nov_osnutek.yml b/config/sync/content_moderation_notifications.content_moderation_notification.nov_osnutek.yml
index 34a5339..25b0227 100644
--- a/config/sync/content_moderation_notifications.content_moderation_notification.nov_osnutek.yml
+++ b/config/sync/content_moderation_notifications.content_moderation_notification.nov_osnutek.yml
@@ -14,6 +14,6 @@ site_mail: false
 emails: ''
 subject: '[YUFU] New draft [node:title]'
 body:
-  value: "New draft pedning moderation: [node:title] ([node:nid]) by [node:author:email].\r\n\r\n[node:url]\r\n\r\n[node:body]"
+  value: "New draft pending moderation: [node:title] ([node:nid]) by [node:author:mail].\r\n\r\n[node:url]/revisions/view/[node:original:vid]/[node:vid]/visual_inline\r\n\r\n[node:body]"
   format: plain_text
 label: 'Nov osnutek'
diff --git a/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php b/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php
index 2cf9171..dd8ad60 100644
--- a/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php
+++ b/web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php
@@ -8,7 +8,6 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\TypedData\Exception\MissingDataException;
 use Drupal\node\NodeInterface;
 use Drupal\rest\Plugin\ResourceBase;
-// use Drupal\rest\ResourceResponse;
 use Psr\Log\LogLevel;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -101,7 +100,7 @@ class AddConcept extends ResourceBase {
    * @param \Symfony\Component\HttpFoundation\Request;
    *   Post request.
    *
-   * @return \Drupal\rest\ResourceResponse
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
    *  Returns rest resource.
    */
   public function post(Request $request) {
@@ -168,7 +167,6 @@ class AddConcept extends ResourceBase {
       'revision_uid' => $concept->getRevisionUserId(),
       'uid' => $concept->uid->target_id,
     ];
-    // $response = new ResourceResponse($response_status);
     $response = new JsonResponse($response_status);
     return $response;
   }
diff --git a/web/modules/custom/yufu_concept/yufu_concept.module b/web/modules/custom/yufu_concept/yufu_concept.module
index 4cef03a..0d5df26 100644
--- a/web/modules/custom/yufu_concept/yufu_concept.module
+++ b/web/modules/custom/yufu_concept/yufu_concept.module
@@ -12,7 +12,7 @@ use Drupal\node\NodeInterface;
 /**
  * Implements hook_entity_update().
  */
-function yufu_admin_node_presave(EntityInterface $entity) {
+function yufu_concept_node_presave(EntityInterface $entity) {
   //function yufu_concept_entity_update(EntityInterface $entity) {
   if ($entity instanceOf NodeInterface && $entity->bundle() == 'concept') {
     $transition = \Drupal::service('content_moderation_notifications.notification_information')->getTransition($entity);