Merge pull request #546 from City-of-Helsinki/UHF-9107

UHF-9107: Unified button placement on filter searches
City-of-Helsinki · Jan 23, 2024 · b4e6082 · b4e6082
2 parents 7954b9b + 4cac726
commit b4e6082
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 115 deletions.
diff --git a/conf/cmi/views.view.daycare_search.yml b/conf/cmi/views.view.daycare_search.yml
@@ -416,60 +416,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-        tpr_provided_languages:
-          id: tpr_provided_languages
-          table: tpr_unit__provided_languages
-          field: tpr_provided_languages
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: tpr_unit
-          plugin_id: tpr_provided_languages
-          operator: in
-          value:
-            fi: fi
-            sv: sv
-            se: se
-          group: 1
-          exposed: true
-          expose:
-            operator_id: tpr_provided_languages_op
-            label: 'Choose the operating language'
-            description: ''
-            use_operator: false
-            operator: tpr_provided_languages_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: languages
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              read_only: '0'
-              daycare_editor: '0'
-              playground_editor: '0'
-              comprehensive_school_editor: '0'
-              school_editor: '0'
-              content_producer: '0'
-              editor: '0'
-              admin: '0'
-              debug_api: '0'
-              super_administrator: '0'
-            reduce: true
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
         field_categories_value:
           id: field_categories_value
           table: tpr_unit__field_categories
@@ -529,6 +475,60 @@ display:
                 title: 'Playgroup clubs'
                 operator: '='
                 value: 'club activities (child day care play activities)'
+        tpr_provided_languages:
+          id: tpr_provided_languages
+          table: tpr_unit__provided_languages
+          field: tpr_provided_languages
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_unit
+          plugin_id: tpr_provided_languages
+          operator: in
+          value:
+            fi: fi
+            sv: sv
+            se: se
+          group: 1
+          exposed: true
+          expose:
+            operator_id: tpr_provided_languages_op
+            label: 'Choose the operating language'
+            description: ''
+            use_operator: false
+            operator: tpr_provided_languages_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: languages
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              read_only: '0'
+              daycare_editor: '0'
+              playground_editor: '0'
+              comprehensive_school_editor: '0'
+              school_editor: '0'
+              content_producer: '0'
+              editor: '0'
+              admin: '0'
+              debug_api: '0'
+              super_administrator: '0'
+            reduce: true
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
       filter_groups:
         operator: AND
         groups:
@@ -593,6 +593,7 @@ display:
         - user
         - user.permissions
       tags:
+        - 'config:core.entity_view_display.tpr_unit.tpr_unit.after_school_activity_card'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.default'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.high_school_card'
@@ -617,6 +618,7 @@ display:
         - user
         - user.permissions
       tags:
+        - 'config:core.entity_view_display.tpr_unit.tpr_unit.after_school_activity_card'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.default'
         - 'config:core.entity_view_display.tpr_unit.tpr_unit.high_school_card'