Revert unwanded changes

City-of-Helsinki · Jan 18, 2024 · b24f954 · b24f954
1 parent 7f6ebc0
commit b24f954
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 6 deletions.
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -21,6 +21,7 @@ dependencies:
     - paragraphs
     - path
     - readonly_field_widget
+    - select2
     - text
 _core:
   default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM
@@ -176,6 +177,16 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_ontologyword_details:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 30
@@ -373,6 +384,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  subgroup:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   toc_enabled:
     type: boolean_checkbox
     weight: 3
@@ -426,9 +447,7 @@ hidden:
   field_categories: true
   field_districts: true
   field_hs_front_page: true
-  field_ontologyword_details: true
   field_study_field: true
   hide_description: true
   ontologyword_ids: true
   show_www: true
-  subgroup: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -17,6 +17,7 @@ dependencies:
     - address
     - entity_reference_revisions
     - helfi_address_search
+    - helfi_kasko_content
     - helfi_tpr
     - imagecache_external
     - link
@@ -139,7 +140,14 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 17
+    weight: 19
+    region: content
+  field_ontologyword_details:
+    type: tpr_ontologyword_details_formatter
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 28
     region: content
   highlights:
     type: tpr_connection
@@ -258,7 +266,14 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 16
+    weight: 18
+    region: content
+  subgroup:
+    type: tpr_connection
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 32
     region: content
   toc_enabled:
     type: boolean
@@ -301,12 +316,10 @@ hidden:
   field_categories: true
   field_districts: true
   field_hs_front_page: true
-  field_ontologyword_details: true
   field_study_field: true
   field_unit_type: true
   hide_description: true
   langcode: true
   search_api_excerpt: true
   show_www: true
   streetview_entrance_url: true
-  subgroup: true
diff --git a/conf/cmi/language/fi/views.view.comprehensive_school_search.yml b/conf/cmi/language/fi/views.view.comprehensive_school_search.yml
@@ -0,0 +1,25 @@
+label: Peruskouluhaku
+display:
+  default:
+    display_title: Oletus
+    display_options:
+      title: Peruskouluhaku
+      pager:
+        options:
+          tags:
+            next: Seuraava
+            previous: Edellinen
+            first: Ensimmäinen
+            last: Viimeinen
+          expose:
+            items_per_page_label: 'Kohteita sivulla'
+            items_per_page_options_all_label: '- Kaikki -'
+      exposed_form:
+        options:
+          submit_button: Käytä
+          reset_button_label: Palauta
+          exposed_sorts_label: Järjestä
+          sort_asc_label: Nouseva
+          sort_desc_label: Laskeva
+  block:
+    display_title: Lohko
diff --git a/conf/cmi/language/sv/views.view.comprehensive_school_search.yml b/conf/cmi/language/sv/views.view.comprehensive_school_search.yml
@@ -0,0 +1,26 @@
+label: 'Grundskola sök'
+display:
+  default:
+    display_title: Förvald
+    display_options:
+      title: 'Grundskola sök'
+      pager:
+        options:
+          tags:
+            next: Nästa
+            previous: Föregående
+            first: Första
+            last: Sista
+          expose:
+            items_per_page_label: 'Inlägg per sida'
+            items_per_page_options_all_label: '- Alla -'
+            offset_label: Kompensera
+      exposed_form:
+        options:
+          submit_button: Filtrera
+          reset_button_label: Återställ
+          exposed_sorts_label: 'Sortera efter'
+          sort_asc_label: Stigande
+          sort_desc_label: Fallande
+  block:
+    display_title: Block