Merge pull request #572 from UN-OCHA/develop

v1.14.0

docker/Dockerfile

@@ -12,9 +12,6 @@ WORKDIR /srv/www
 
 # Clean up previous composer installation and run new one.
 RUN rm -rf ./vendor && \
-    # Update composer to avoid issues with missing drupal files.
-    # @see https://github.com/drupal-composer/drupal-project/issues/282
-    composer selfupdate && \
     composer install --no-interaction
 
 # Copy settings to default site location.

html/modules/custom/reliefweb_entities/reliefweb_entities.module

@@ -681,6 +681,7 @@ function reliefweb_entities_cron() {
   $embargoed_ids = $storage
     ->getQuery()
     ->condition('type', 'report', '=')
+    ->condition('moderation_status', 'embargoed', '=')
     ->condition('field_embargo_date.value', gmdate("Y-m-d\TH:i:s"), '<')
     ->range(0, $cron_settings['embargoed_reports_limit'] ?? 20)
     ->execute();
@@ -694,6 +695,7 @@ function reliefweb_entities_cron() {
       $report->field_embargo_date->setValue([]);
       $report->setNewRevision(TRUE);
       $report->setRevisionUserId(2);
+      $report->setRevisionCreationTime(time());
       $report->setRevisionLogMessage(strtr('Embargoed document automatically published on @date.', [
         '@date' => DateHelper::format($timestamp, 'custom', 'd M Y H:i e'),
       ]));
@@ -728,6 +730,7 @@ function reliefweb_entities_cron() {
       $node->setModerationStatus('expired');
       $node->setNewRevision(TRUE);
       $node->setRevisionUserId(2);
+      $node->setRevisionCreationTime(time());
       $node->setRevisionLogMessage(strtr('@type automatically expired on @date.', [
         '@type' => ucfirst($node->bundle()),
         '@date' => DateHelper::format($time, 'custom', 'd M Y H:i e'),

html/modules/custom/reliefweb_entities/src/DocumentTrait.php

@@ -298,7 +298,7 @@ public function getEntityMetaFromField($field, $code = NULL, array $extra_fields
       if ($code !== NULL) {
         $url = RiverServiceBase::getRiverUrl($this->bundle(), [
           'advanced-search' => '(' . $code . $entity->id() . ')',
-        ]);
+        ], $entity->label(), TRUE);
       }
       else {
         $url = $entity->toUrl();