Skip to content

Commit

Permalink
Merge pull request #272 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history 
Dev to main
  • Loading branch information
@rpnykanen
rpnykanen authored Jun 14, 2023
2 parents f9c7faa + 4b20088 commit af86e29
Show file tree
Hide file tree
Showing 25 changed files with 525 additions and 199 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"weitzman/drupal-test-traits": "^2.0"
},
"conflict": {
Expand Down
217 changes: 111 additions & 106 deletions composer.lock
View file

Large diffs are not rendered by default.

113 changes: 82 additions & 31 deletions conf/cmi/core.entity_form_display.node.job_listing.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ dependencies:
- field.field.node.job_listing.field_employment
- field.field.node.job_listing.field_employment_type
- field.field.node.job_listing.field_image
- field.field.node.job_listing.field_job_description_override
- field.field.node.job_listing.field_job_duration
- field.field.node.job_listing.field_jobs
- field.field.node.job_listing.field_last_changed_remote
- field.field.node.job_listing.field_link_to_application
- field.field.node.job_listing.field_link_to_presentation
- field.field.node.job_listing.field_organization
- field.field.node.job_listing.field_organization_description
- field.field.node.job_listing.field_organization_description_o
- field.field.node.job_listing.field_organization_name
- field.field.node.job_listing.field_organization_override
- field.field.node.job_listing.field_original_language
- field.field.node.job_listing.field_postal_area
- field.field.node.job_listing.field_postal_code
Expand All @@ -34,13 +37,33 @@ dependencies:
- node.type.job_listing
module:
- datetime
- field_group
- hdbt_admin_tools
- link
- media_library
- path
- publication_date
- scheduler
- text
third_party_settings:
field_group:
group_override_fields:
children:
- field_prevent_publishing
- field_job_description_override
- field_organization_override
- field_organization_description_o
label: 'Override fields'
region: content
parent_name: ''
weight: 15
format_type: fieldset
format_settings:
classes: ''
show_empty_fields: false
id: ''
description: ''
required_fields: false
id: node.job_listing.default
targetEntityType: node
bundle: job_listing
Expand All @@ -54,37 +77,37 @@ content:
third_party_settings: { }
field_address:
type: string_textfield
weight: 22
weight: 25
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_anonymous:
type: boolean_checkbox
weight: 15
weight: 18
region: content
settings:
display_label: true
third_party_settings: { }
field_contacts:
type: text_textarea
weight: 28
weight: 32
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_copied:
type: boolean_checkbox
weight: 39
weight: 45
region: content
settings:
display_label: true
third_party_settings: { }
field_employment:
type: entity_reference_autocomplete
weight: 17
weight: 20
region: content
settings:
match_operator: CONTAINS
Expand All @@ -94,7 +117,7 @@ content:
third_party_settings: { }
field_employment_type:
type: entity_reference_autocomplete
weight: 16
weight: 19
region: content
settings:
match_operator: CONTAINS
Expand All @@ -104,51 +127,61 @@ content:
third_party_settings: { }
field_image:
type: media_library_widget
weight: 29
weight: 33
region: content
settings:
media_types: { }
third_party_settings: { }
field_job_description_override:
type: text_textarea_with_summary
weight: 17
region: content
settings:
rows: 9
summary_rows: 3
placeholder: ''
show_summary: false
third_party_settings: { }
field_job_duration:
type: string_textfield
weight: 21
weight: 24
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_jobs:
type: number
weight: 14
weight: 17
region: content
settings:
placeholder: ''
third_party_settings: { }
field_last_changed_remote:
type: datetime_default
weight: 35
weight: 41
region: content
settings: { }
third_party_settings: { }
field_link_to_application:
type: link_default
weight: 19
weight: 22
region: content
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
field_link_to_presentation:
type: link_default
weight: 36
weight: 42
region: content
settings:
placeholder_url: ''
placeholder_title: ''
third_party_settings: { }
field_organization:
type: entity_reference_autocomplete
weight: 30
weight: 35
region: content
settings:
match_operator: CONTAINS
Expand All @@ -158,95 +191,113 @@ content:
third_party_settings: { }
field_organization_description:
type: text_textarea
weight: 31
weight: 37
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_organization_description_o:
type: text_textarea
weight: 19
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_organization_name:
type: string_textfield
weight: 21
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_organization_override:
type: entity_reference_autocomplete
weight: 18
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_original_language:
type: options_select
weight: 40
weight: 46
region: content
settings: { }
third_party_settings: { }
field_postal_area:
type: string_textfield
weight: 24
weight: 27
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_postal_code:
type: string_textfield
weight: 23
weight: 26
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_prevent_publishing:
type: boolean_checkbox
weight: 13
weight: 16
region: content
settings:
display_label: true
third_party_settings: { }
field_publication_ends:
type: datetime_default
weight: 38
weight: 44
region: content
settings: { }
third_party_settings: { }
field_publication_starts:
type: datetime_default
weight: 37
weight: 43
region: content
settings: { }
third_party_settings: { }
field_recruitment_id:
type: string_textfield
weight: 25
weight: 28
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_recruitment_type:
type: number
weight: 33
weight: 39
region: content
settings:
placeholder: ''
third_party_settings: { }
field_salary:
type: string_textfield
weight: 20
weight: 23
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_salary_class:
type: string_textfield
weight: 27
weight: 31
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_task_area:
type: entity_reference_autocomplete
weight: 34
weight: 40
region: content
settings:
match_operator: CONTAINS
Expand All @@ -256,14 +307,14 @@ content:
third_party_settings: { }
field_video:
type: media_library_widget
weight: 32
weight: 38
region: content
settings:
media_types: { }
third_party_settings: { }
job_description:
type: text_textarea_with_summary
weight: 26
weight: 30
region: content
settings:
rows: 9
Expand Down Expand Up @@ -309,13 +360,13 @@ content:
settings: { }
third_party_settings: { }
simple_sitemap:
weight: 10
weight: 12
region: content
settings: { }
third_party_settings: { }
status:
type: boolean_checkbox
weight: 11
weight: 13
region: content
settings:
display_label: true
Expand All @@ -329,7 +380,7 @@ content:
third_party_settings: { }
title:
type: string_textfield
weight: 12
weight: 14
region: content
settings:
size: 60
Expand Down Expand Up @@ -357,7 +408,7 @@ content:
settings: { }
third_party_settings: { }
url_redirects:
weight: 10
weight: 11
region: content
settings: { }
third_party_settings: { }
Expand Down
Loading

0 comments on commit af86e29

Please sign in to comment.