Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.24.0 #997

Merged
merged 20 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b748e6e
Merge pull request #990 from UN-OCHA/main
orakili Jan 21, 2025
32d3bb1
feat: add drush command to export manually retagged content
orakili Jan 21, 2025
7b0a17f
feat: add rule to discard submission that have the same content in di…
orakili Jan 21, 2025
aa0ab0a
feat: ensure the entity revision history cache is cleared when deleti…
orakili Jan 21, 2025
abe5b6d
Merge branch 'develop' into RW-1159
orakili Jan 26, 2025
ff1514d
Merge pull request #992 from UN-OCHA/RW-1159
orakili Jan 28, 2025
58a80dc
Merge branch 'develop' into RW-1160
orakili Jan 28, 2025
43cc1bb
Merge pull request #993 from UN-OCHA/RW-1160
orakili Jan 28, 2025
bd41833
Merge branch 'develop' into RW-1162
orakili Jan 28, 2025
7aa556b
Merge pull request #994 from UN-OCHA/RW-1162
orakili Jan 28, 2025
0429d8f
chore: update amazon_ses and change patch
orakili Jan 28, 2025
6e96e50
Merge pull request #995 from UN-OCHA/OPS-11278-amazon-ses-patch
orakili Jan 28, 2025
096f0c0
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 28, 2025
ec9de7f
Merge pull request #996 from UN-OCHA/update/patch-6e96e50
orakili Jan 28, 2025
3fde60b
chore: add csp exception for clarity analytics
lazysoundsystem Jan 28, 2025
b0c39f8
Merge pull request #998 from UN-OCHA/RW-1164-clarity-csp
orakili Jan 28, 2025
37895b3
feat: add user page with summary of posting rights
orakili Jan 29, 2025
050a2d5
Merge pull request #999 from UN-OCHA/RW-1161
orakili Jan 29, 2025
ec7b6ba
chore: remove google_tag module
lazysoundsystem Jan 29, 2025
0215f7e
Merge pull request #1000 from UN-OCHA/OPS-10039-remove-google_tag-module
orakili Jan 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions PATCHES/amazon_ses-3417090-cron-queue-14.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
diff --git a/src/Plugin/QueueWorker/AmazonSesMailQueue.php b/src/Plugin/QueueWorker/AmazonSesMailQueue.php
index dc410504566451d20aec939de6953e6d1a6e9be9..fdc7af32ac6634c51283fb38f0227530a1772735 100644
--- a/src/Plugin/QueueWorker/AmazonSesMailQueue.php
+++ b/src/Plugin/QueueWorker/AmazonSesMailQueue.php
@@ -29,7 +29,12 @@ class AmazonSesMailQueue extends QueueWorkerBase implements ContainerFactoryPlug
$plugin_definition
);

- $instance->setHandler($container->get('amazon_ses.handler'));
+ // Only set the handler if queueing is enabled to avoid an error when
+ // trying to run without config.
+ $enabled = \Drupal::config('amazon_ses.settings')->get('queue');
+ if ($enabled) {
+ $instance->setHandler($container->get('amazon_ses.handler'));
+ }

return $instance;
}
diff --git a/amazon_ses.module b/amazon_ses.module
new file mode 100644
index 0000000..4b1ba5f
--- /dev/null
+++ b/amazon_ses.module
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Hooks for the amazon_ses module.
+ */
+
+/**
+ * Implements hook_queue_info_alter().
+ */
+function amazon_ses_queue_info_alter(&$queues) {
+ $enabled = \Drupal::config('amazon_ses.settings')->get('queue');
+
+ if (!$enabled && isset($queues['amazon_ses_mail_queue']['cron'])) {
+ unset($queues['amazon_ses_mail_queue']['cron']);
+ }
+}
Loading