Updated news item groups in node edit form.

City-of-Helsinki · Nov 21, 2024 · 81a3684 · 81a3684
1 parent d11fffb
commit 81a3684
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml
@@ -19,13 +19,13 @@ dependencies:
   module:
     - field_group
     - hdbt_admin_tools
+    - helfi_annif
     - linkit
     - media_library
     - paragraphs
     - path
     - publication_date
     - radioactivity
-    - readonly_field_widget
     - scheduler
     - select2
 third_party_settings:
@@ -95,11 +95,11 @@ third_party_settings:
       children:
         - in_recommendations
         - show_annif_block
-        - annif_keywords
+        - annif_suggested_topics
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
-      weight: 25
+      weight: 28
       format_type: fieldset
       format_settings:
         classes: ''
@@ -170,7 +170,7 @@ content:
     third_party_settings: {  }
   field_news_groups:
     type: select2_entity_reference
-    weight: 26
+    weight: 25
     region: content
     settings:
       width: 100%
@@ -198,7 +198,7 @@ content:
     third_party_settings: {  }
   field_news_item_tags:
     type: select2_entity_reference
-    weight: 19
+    weight: 26
     region: content
     settings:
       width: 100%

diff --git a/...m/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml b/...m/helfi_etusivu_config/config/rewrite/core.entity_form_display.node.news_item.default.yml
@@ -18,13 +18,13 @@ dependencies:
   module:
     - field_group
     - hdbt_admin_tools
+    - helfi_annif
     - linkit
     - media_library
     - paragraphs
     - path
     - publication_date
     - radioactivity
-    - readonly_field_widget
     - scheduler
     - select2
 third_party_settings:
@@ -48,11 +48,11 @@ third_party_settings:
       children:
         - in_recommendations
         - show_annif_block
-        - annif_keywords
+        - annif_suggested_topics
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
-      weight: 25
+      weight: 28
       format_type: fieldset
       format_settings:
         classes: ''
@@ -82,6 +82,16 @@ content:
         duplicate: '0'
     third_party_settings: {  }
   field_news_groups:
+    type: select2_entity_reference
+    weight: 25
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
+  field_news_item_tags:
     type: select2_entity_reference
     weight: 26
     region: content
@@ -107,20 +117,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  annif_keywords:
-    type: readonly_field_widget
-    weight: 2
-    region: content
-    settings:
-      label: above
-      formatter_type: entity_reference_label
-      formatter_settings:
-        entity_reference_entity_view:
-          view_mode: default
-        entity_reference_label:
-          link: false
-      show_description: false
-    third_party_settings: {  }
   in_recommendations:
     type: boolean_checkbox
     weight: 0