Merge remote-tracking branch 'origin/release/2.5' into develop

dzonidoo · Dec 1, 2023 · aee854c · aee854c
2 parents 63ec996 + 0189ae8
commit aee854c
Show file tree

Hide file tree

Showing 8 changed files with 14,932 additions and 57 deletions.
diff --git a/assets/wire/utils.ts b/assets/wire/utils.ts
@@ -72,14 +72,14 @@ export function getOtherMedia(item: IArticle): Array<IArticle> | null {
         return null;
     }
 
-    return Object.entries(item.associations ?? {})
-        .filter(([key, mediaItem]) => (
+    return Object.entries(item.associations || {})
+        .filter(([key, item]) => (
             !key.startsWith('editor_') &&
             key !== 'featuremedia' &&
-            mediaItem != null &&
-            ['video', 'audio'].includes(mediaItem.type)
+            item != null &&
+            ['video', 'audio'].includes(item.type)
         ))
-        .map((args) => args[1]) as IArticle[]; // it's filtering out null values in .filter
+        .map(([key, item]) => item) as IArticle[]; // null values are filtered in .filter
 }
 
 /**

diff --git a/newsroom/push.py b/newsroom/push.py
@@ -100,7 +100,9 @@ def push():
     elif item.get("type") == "text":
         orig = superdesk.get_resource_service("items").find_one(req=None, _id=item["guid"])
         item["_id"] = publish_item(item, orig)
-        notify_new_wire_item.delay(item["_id"], check_topics=orig is None)
+        notify_new_wire_item.delay(
+            item["_id"], check_topics=orig is None or app.config["WIRE_NOTIFICATIONS_ON_CORRECTIONS"]
+        )
     elif item["type"] == "planning_featured":
         publish_planning_featured(item)
     else:

diff --git a/newsroom/translations/fi/LC_MESSAGES/messages.mo b/newsroom/translations/fi/LC_MESSAGES/messages.mo