View za revision history

.gitignore

@@ -7,6 +7,8 @@
 
 # Ignore configuration files that may contain sensitive information
 /web/sites/*/settings.local.php
+# Ignore ddev settings
+/web/sites/*/settings.ddev.php
 
 # Ignore paths that may contain user-generated content
 /web/sites/*/files

README.md

@@ -24,6 +24,10 @@ Sajt je dostopen preko naslova: https://yufu-manifest.ddev.site/
 
 Lahko pa napišemo tudi `ddev launch`
 
+v `web/sites/default/settings.local.php` dodamo vrstico, ki vključi services nastavitve, ki omogočijo CORS:
+
+`$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/default/yufu.services.yml';`
+
 ### Postavitev (vuejs) "prednjegadela"
 
 Najprej gremo v podfolder `nuxt` in namestimo odvisne javascript pakete:

web/modules/custom/yufu_admin/yufu_admin.module

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

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

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

web/sites/default/settings.ddev.php

@@ -1,50 +0,0 @@
-<?php
-
-$host = "db";
-$port = 3306;
-$driver = "mysql";
-
-// If DDEV_PHP_VERSION is not set but IS_DDEV_PROJECT *is*, it means we're running (drush) on the host,
-// so use the host-side bind port on docker IP
-if (empty(getenv('DDEV_PHP_VERSION') && getenv('IS_DDEV_PROJECT') == 'true')) {
-  $host = "127.0.0.1";
-  $port = 32786;
-}
-
-$databases['default']['default'] = array(
-  'database' => "db",
-  'username' => "db",
-  'password' => "db",
-  'host' => $host,
-  'driver' => $driver,
-  'port' => $port,
-  'prefix' => "",
-);
-
-$settings['hash_salt'] = 'kShGqBypYstnMBJYmaRocqYLQcvBTMgvGbLQkdODVMavjRUyDhgBFcSAideqnFoM';
-
-// This will prevent Drupal from setting read-only permissions on sites/default.
-$settings['skip_permissions_hardening'] = TRUE;
-
-// This will ensure the site can only be accessed through the intended host
-// names. Additional host patterns can be added for custom configurations.
-$settings['trusted_host_patterns'] = ['.*'];
-
-// Don't use Symfony's APCLoader. ddev includes APCu; Composer's APCu loader has
-// better performance.
-$settings['class_loader_auto_detect'] = FALSE;
-
-// Set $settings['config_sync_directory'] if not set in settings.php.
-if (empty($settings['config_sync_directory'])) {
-  $settings['config_sync_directory'] = 'sites/default/files/sync';
-}
-
-// Override drupal/symfony_mailer default config to use Mailhog
-$config['symfony_mailer.mailer_transport.sendmail']['plugin'] = 'smtp';
-$config['symfony_mailer.mailer_transport.sendmail']['configuration']['user']='';
-$config['symfony_mailer.mailer_transport.sendmail']['configuration']['pass']='';
-$config['symfony_mailer.mailer_transport.sendmail']['configuration']['host']='localhost';
-$config['symfony_mailer.mailer_transport.sendmail']['configuration']['port']='1025';
-
-// Development services (for CORS)
-$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/yufu.dev.services.yml';

web/sites/default/yufu.services.yml

@@ -0,0 +1,4 @@
+services:
+  cors.config:
+    enabled: true
+