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

superdesk · Oct 26, 2023 · 5ef7a0b · 5ef7a0b
2 parents 653812f + 094619a
commit 5ef7a0b
Show file tree

Hide file tree

Showing 6 changed files with 309 additions and 168 deletions.
diff --git a/e2e/cypress/support/forms/editCompany.js b/e2e/cypress/support/forms/editCompany.js
@@ -31,6 +31,8 @@ class EditCompanyFormWrapper extends BaseForm {
         } else {
             this.getFormElement('[data-test-id="save-btn"]').click();
         }
+        // wait for sidebar to close
+        this.getFormElement('[data-test-id="save-btn"]').should('not.exist');
     }
 
     getNewlyCreatedCompanyId(callback) {

diff --git a/newsroom/topics/topics.py b/newsroom/topics/topics.py
@@ -54,7 +54,7 @@ class TopicsResource(newsroom.Resource):
         "navigation": {
             "type": "list",
             "nullable": True,
-            "schema": {"type": "string"},
+            "schema": newsroom.Resource.rel("navigations"),
         },
         "original_creator": newsroom.Resource.rel("users"),
         "version_creator": newsroom.Resource.rel("users"),

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