yufu
/
manifest
6
2
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 4 Releases Wiki Activity

Popravilo nastavitve stanja moderacije.

pull/59/head
Lio Novelli 2024-04-01 16:50:04 +02:00 committed by Jurij Podgoršek
parent 350256a853
commit 695d06da33
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/modules/custom/yufu_admin/yufu_admin.module
View File

@ -130,13 +130,13 @@ function _yufu_admin_concept_drafted_mail(NodeInterface $node) {
if ($node->isNew()) { if ($node->isNew()) {
$params['message'] = t('New concept created: @title - @url', [ $params['message'] = t('New concept created: @title - @url', [
'@title' => $node->getTitle(), '@title' => $node->getTitle(),
'@url' => !$node->isNew() ? $node?->toUrl()?->toString() : '', '@url' => '',
]); ]);
} }
else { else {
$params['message'] = t('New changes to concept proposed: @title - @url', [ $params['message'] = t('New changes to concept proposed: @title - @url', [
'@title' => $node->getTitle(), '@title' => $node->getTitle(),
'@url' => !$node->isNew() ? $node?->toUrl()?->toString() : '', '@url' => $node?->toUrl()?->toString(),
]); ]);
} }
$params['node_title'] = $node->getTitle(); $params['node_title'] = $node->getTitle();

10
web/modules/custom/yufu_concept/src/Plugin/rest/resource/AddConcept.php
View File

@ -12,6 +12,7 @@ use Drupal\rest\ResourceResponse;
use Psr\Log\LogLevel; use Psr\Log\LogLevel;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@ -125,9 +126,8 @@ class AddConcept extends ResourceBase {
$concept->set('body', $data['text'] ?? $concept->body->value); $concept->set('body', $data['text'] ?? $concept->body->value);
$concept->isDefaultRevision(FALSE); $concept->isDefaultRevision(FALSE);
$concept->setRevisionLogMessage('New revision by concept endpoint.'); $concept->setRevisionLogMessage('New revision by concept endpoint.');
$concept->moderation_state->target_id = 'draft'; $concept->set('moderation_state', 'draft');
$concept->set('status', 0); $concept->set('status', 0);
$concept->setUnpublished();
$concept->save(); $concept->save();
$this->logger->notice('New concept @title revision @revid created by uid @uid.', [ $this->logger->notice('New concept @title revision @revid created by uid @uid.', [
'@title' => $concept->getTitle(), '@title' => $concept->getTitle(),
@ -163,7 +163,8 @@ class AddConcept extends ResourceBase {
'revision_uid' => $concept->getRevisionUserId(), 'revision_uid' => $concept->getRevisionUserId(),
'uid' => $concept->uid->target_id, 'uid' => $concept->uid->target_id,
]; ];
$response = new ResourceResponse($response_status); // $response = new ResourceResponse($response_status);
$response = new JsonResponse($response_status);
return $response; return $response;
} }
@ -182,7 +183,8 @@ class AddConcept extends ResourceBase {
return NULL; return NULL;
} }
$node_storage = $this->entityTypeManager->getStorage('node'); $node_storage = $this->entityTypeManager->getStorage('node');
if ($concept = end($node_storage->loadByProperties(['uuid' => $uuid]))) { $concepts = $node_storage->loadByProperties(['uuid' => $uuid]);
if ($concept = end($concepts)) {
return $concept; return $concept;
} }
return NULL; return NULL;