Skip to content

Commit

Permalink
Merge pull request #847 from City-of-Helsinki/update-configuration
Browse files Browse the repository at this point in the history
Automatic update
  • Loading branch information
khalima authored Apr 5, 2024
2 parents c526caa + fe31806 commit 74c882e
Show file tree
Hide file tree
Showing 15 changed files with 391 additions and 234 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# PHPStan's baseline uses tabs instead of spaces.
core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
Expand Down
397 changes: 200 additions & 197 deletions composer.lock

Large diffs are not rendered by default.

81 changes: 49 additions & 32 deletions conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_phone_label
- field.field.tpr_unit.tpr_unit.field_phone_with_contacts
- field.field.tpr_unit.tpr_unit.field_unit_type
module:
- allowed_formats
Expand All @@ -18,15 +20,15 @@ dependencies:
- readonly_field_widget
- text
_core:
default_config_hash: u4cfdWUfiLgxWmusemjNf4p9sa_VCrlVLyYe8slNTEk
default_config_hash: rWjpesn9mLPiT19k4RZ1DEjahx07CnmM2G6kg47-IFE
id: tpr_unit.tpr_unit.default
targetEntityType: tpr_unit
bundle: tpr_unit
mode: default
content:
accessibility_email:
type: readonly_field_widget
weight: 12
weight: 14
region: content
settings:
label: above
Expand All @@ -36,7 +38,7 @@ content:
third_party_settings: { }
accessibility_phone:
type: readonly_field_widget
weight: 11
weight: 13
region: content
settings:
label: above
Expand All @@ -46,7 +48,7 @@ content:
third_party_settings: { }
accessibility_www:
type: readonly_field_widget
weight: 17
weight: 19
region: content
settings:
label: above
Expand All @@ -56,7 +58,7 @@ content:
third_party_settings: { }
address:
type: readonly_field_widget
weight: 20
weight: 22
region: content
settings:
label: above
Expand All @@ -66,7 +68,7 @@ content:
third_party_settings: { }
address_postal:
type: readonly_field_widget
weight: 21
weight: 24
region: content
settings:
label: above
Expand All @@ -76,7 +78,7 @@ content:
third_party_settings: { }
call_charge_info:
type: readonly_field_widget
weight: 20
weight: 23
region: content
settings:
label: above
Expand All @@ -86,7 +88,7 @@ content:
third_party_settings: { }
contacts:
type: readonly_field_widget
weight: 39
weight: 43
region: content
settings:
label: above
Expand All @@ -96,7 +98,7 @@ content:
third_party_settings: { }
description:
type: readonly_field_widget
weight: 18
weight: 20
region: content
settings:
label: above
Expand All @@ -106,7 +108,7 @@ content:
third_party_settings: { }
email:
type: readonly_field_widget
weight: 10
weight: 12
region: content
settings:
label: above
Expand All @@ -116,7 +118,7 @@ content:
third_party_settings: { }
enrich_description:
type: text_textarea
weight: 19
weight: 21
region: content
settings:
rows: 5
Expand All @@ -127,7 +129,7 @@ content:
hide_guidelines: '1'
field_content:
type: paragraphs
weight: 28
weight: 31
region: content
settings:
title: Paragraph
Expand All @@ -146,7 +148,7 @@ content:
third_party_settings: { }
field_lower_content:
type: paragraphs
weight: 29
weight: 33
region: content
settings:
title: Paragraph
Expand All @@ -165,15 +167,30 @@ content:
third_party_settings: { }
field_metatags:
type: metatag_firehose
weight: 27
weight: 30
region: content
settings:
sidebar: false
use_details: true
third_party_settings: { }
field_phone_label:
type: string_textfield
weight: 11
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_phone_with_contacts:
type: boolean_checkbox
weight: 10
region: content
settings:
display_label: true
third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 30
weight: 34
region: content
settings:
match_operator: CONTAINS
Expand All @@ -183,14 +200,14 @@ content:
third_party_settings: { }
hide_sidebar_navigation:
type: boolean_checkbox
weight: 31
weight: 35
region: content
settings:
display_label: true
third_party_settings: { }
highlights:
type: readonly_field_widget
weight: 36
weight: 40
region: content
settings:
label: above
Expand All @@ -207,7 +224,7 @@ content:
third_party_settings: { }
latitude:
type: readonly_field_widget
weight: 22
weight: 25
region: content
settings:
label: above
Expand All @@ -217,7 +234,7 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
weight: 33
weight: 37
region: content
settings:
label: above
Expand All @@ -227,7 +244,7 @@ content:
third_party_settings: { }
longitude:
type: readonly_field_widget
weight: 23
weight: 26
region: content
settings:
label: above
Expand Down Expand Up @@ -255,7 +272,7 @@ content:
third_party_settings: { }
opening_hours:
type: readonly_field_widget
weight: 35
weight: 39
region: content
settings:
label: above
Expand All @@ -265,7 +282,7 @@ content:
third_party_settings: { }
other_info:
type: readonly_field_widget
weight: 37
weight: 41
region: content
settings:
label: above
Expand All @@ -275,7 +292,7 @@ content:
third_party_settings: { }
path:
type: path
weight: 16
weight: 18
region: content
settings: { }
third_party_settings: { }
Expand Down Expand Up @@ -308,7 +325,7 @@ content:
third_party_settings: { }
price_info:
type: readonly_field_widget
weight: 38
weight: 42
region: content
settings:
label: above
Expand All @@ -318,7 +335,7 @@ content:
third_party_settings: { }
provided_languages:
type: readonly_field_widget
weight: 32
weight: 36
region: content
settings:
label: above
Expand All @@ -328,7 +345,7 @@ content:
third_party_settings: { }
service_map_embed:
type: readonly_field_widget
weight: 25
weight: 28
region: content
settings:
label: above
Expand All @@ -338,7 +355,7 @@ content:
third_party_settings: { }
services:
type: readonly_field_widget
weight: 26
weight: 29
region: content
settings:
label: above
Expand All @@ -348,19 +365,19 @@ content:
third_party_settings: { }
show_www:
type: boolean_checkbox
weight: 15
weight: 17
region: content
settings:
display_label: true
third_party_settings: { }
simple_sitemap:
weight: 14
weight: 16
region: content
settings: { }
third_party_settings: { }
streetview_entrance_url:
type: readonly_field_widget
weight: 24
weight: 27
region: content
settings:
label: above
Expand All @@ -385,7 +402,7 @@ content:
third_party_settings: { }
topical:
type: readonly_field_widget
weight: 34
weight: 38
region: content
settings:
label: above
Expand All @@ -408,7 +425,7 @@ content:
third_party_settings: { }
www:
type: readonly_field_widget
weight: 13
weight: 15
region: content
settings:
label: above
Expand Down
22 changes: 21 additions & 1 deletion conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_phone_label
- field.field.tpr_unit.tpr_unit.field_phone_with_contacts
- field.field.tpr_unit.tpr_unit.field_unit_type
- responsive_image.styles.image__3_2
module:
Expand All @@ -18,7 +20,7 @@ dependencies:
- telephone
- text
_core:
default_config_hash: 8GmiJoVZmgbZpZ9jGuNv_AQg3EgThOq06AsznzuWOGk
default_config_hash: KKLuQo4x7W4plteNKkenZDXlAFJZq_JIKLNpkVpMvY0
id: tpr_unit.tpr_unit.default
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -134,6 +136,24 @@ content:
third_party_settings: { }
weight: 17
region: content
field_phone_label:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 31
region: content
field_phone_with_contacts:
type: boolean
label: above
settings:
format: default
format_custom_false: ''
format_custom_true: ''
third_party_settings: { }
weight: 33
region: content
highlights:
type: tpr_connection
label: hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_content
- field.field.tpr_unit.tpr_unit.field_lower_content
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_phone_label
- field.field.tpr_unit.tpr_unit.field_phone_with_contacts
- field.field.tpr_unit.tpr_unit.field_unit_type
module:
- address
- helfi_tpr
_core:
default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
default_config_hash: hyQdtfnFAHflVh30neHIGf5Q1EQKwQ6Fh8L40BGc6Q4
id: tpr_unit.tpr_unit.minimal
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -56,6 +58,8 @@ hidden:
field_content: true
field_lower_content: true
field_metatags: true
field_phone_label: true
field_phone_with_contacts: true
field_unit_type: true
hide_description: true
highlights: true
Expand Down
Loading

0 comments on commit 74c882e

Please sign in to comment.