Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
naomi 2022-04-03 19:49:51 +01:00
commit ad356e805f
19 changed files with 329 additions and 72 deletions

View File

@ -42,6 +42,7 @@
"drupal/facets": "^2.0",
"drupal/feeds": "^3.0@alpha",
"drupal/field_permissions": "^1.1",
"drupal/hide_revision_field": "^2.2",
"drupal/password_strength": "^2.0@beta",
"drupal/restui": "^1.20",
"drupal/route_condition": "^2.0",

104
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ba8a408523e89eca2acc25137a7f5705",
"content-hash": "93acd913107c844b44d762597e0351cc",
"packages": [
{
"name": "asm89/stack-cors",
@ -68,7 +68,7 @@
"source": {
"type": "git",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/goodnightout_opencase.git",
"reference": "77bf57003cd1b869f9f7f82c530ab2e879de57a1"
"reference": "86eb555757927091933ba70949aedae7a7474d28"
},
"require": {
"drupal/admin_toolbar": "*",
@ -85,7 +85,7 @@
"email": "helo@autonomic.zone"
}
],
"time": "2022-03-30T14:54:22+00:00"
"time": "2022-04-03T18:47:09+00:00"
},
{
"name": "autonomic/opencase",
@ -93,7 +93,7 @@
"source": {
"type": "git",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git",
"reference": "65fe65474ea48f1cc53707f8db10f7ed9a7d4bbc"
"reference": "34b7a1c7c9a56926bd47e0b024b443033e397d1c"
},
"require": {
"composer/installers": "*",
@ -110,7 +110,7 @@
"email": "helo@autonomic.zone"
}
],
"time": "2022-03-17T10:41:39+00:00"
"time": "2022-04-03T18:27:43+00:00"
},
{
"name": "bjeavons/zxcvbn-php",
@ -163,16 +163,16 @@
},
{
"name": "chi-teck/drupal-code-generator",
"version": "2.5.2",
"version": "2.5.3",
"source": {
"type": "git",
"url": "https://github.com/Chi-teck/drupal-code-generator.git",
"reference": "90f6a8790a71f05d3f4168bae67b73fec6c34294"
"reference": "a49f29b0fe6b6c87fa7dc8979589ce8794c4d655"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/90f6a8790a71f05d3f4168bae67b73fec6c34294",
"reference": "90f6a8790a71f05d3f4168bae67b73fec6c34294",
"url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/a49f29b0fe6b6c87fa7dc8979589ce8794c4d655",
"reference": "a49f29b0fe6b6c87fa7dc8979589ce8794c4d655",
"shasum": ""
},
"require": {
@ -219,9 +219,9 @@
"description": "Drupal code generator",
"support": {
"issues": "https://github.com/Chi-teck/drupal-code-generator/issues",
"source": "https://github.com/Chi-teck/drupal-code-generator/tree/2.5.2"
"source": "https://github.com/Chi-teck/drupal-code-generator/tree/2.5.3"
},
"time": "2022-03-30T16:05:36+00:00"
"time": "2022-03-31T17:15:11+00:00"
},
{
"name": "composer/installers",
@ -457,16 +457,16 @@
},
{
"name": "consolidation/annotated-command",
"version": "4.5.2",
"version": "4.5.3",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
"reference": "24c1529436b4f4beec3d19aab71fd127817f47ef"
"reference": "1941a743e63993288e09d0686a4cb7ed47813213"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/consolidation/annotated-command/zipball/24c1529436b4f4beec3d19aab71fd127817f47ef",
"reference": "24c1529436b4f4beec3d19aab71fd127817f47ef",
"url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1941a743e63993288e09d0686a4cb7ed47813213",
"reference": "1941a743e63993288e09d0686a4cb7ed47813213",
"shasum": ""
},
"require": {
@ -486,7 +486,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "4.x-dev"
"dev-main": "5.x-dev"
}
},
"autoload": {
@ -507,9 +507,9 @@
"description": "Initialize Symfony Console commands from annotated command class methods.",
"support": {
"issues": "https://github.com/consolidation/annotated-command/issues",
"source": "https://github.com/consolidation/annotated-command/tree/4.5.2"
"source": "https://github.com/consolidation/annotated-command/tree/4.5.3"
},
"time": "2022-02-20T16:36:18+00:00"
"time": "2022-04-02T00:17:53+00:00"
},
{
"name": "consolidation/config",
@ -3219,6 +3219,50 @@
"issues": "https://www.drupal.org/project/issues/field_permissions"
}
},
{
"name": "drupal/hide_revision_field",
"version": "2.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/hide_revision_field.git",
"reference": "8.x-2.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/hide_revision_field-8.x-2.2.zip",
"reference": "8.x-2.2",
"shasum": "fd26577c66b6105e2a7cb1df16b2270cf21dfc04"
},
"require": {
"drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-2.2",
"datestamp": "1606459114",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "NickDickinsonWilde",
"homepage": "https://www.drupal.org/user/3094661"
}
],
"description": "Controls visibility of the revision field on content add/edit forms.",
"homepage": "https://www.drupal.org/project/hide_revision_field",
"support": {
"source": "https://git.drupalcode.org/project/hide_revision_field"
}
},
{
"name": "drupal/jquery_ui",
"version": "1.4.0",
@ -10554,16 +10598,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.19",
"version": "9.5.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
"reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"shasum": ""
},
"require": {
@ -10641,7 +10685,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
},
"funding": [
{
@ -10653,7 +10697,7 @@
"type": "github"
}
],
"time": "2022-03-15T09:57:31+00:00"
"time": "2022-04-01T12:37:26+00:00"
},
{
"name": "sebastian/cli-parser",
@ -11021,16 +11065,16 @@
},
{
"name": "sebastian/environment",
"version": "5.1.3",
"version": "5.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac"
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
"reference": "388b6ced16caa751030f6a69e588299fa09200ac",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
"shasum": ""
},
"require": {
@ -11072,7 +11116,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
},
"funding": [
{
@ -11080,7 +11124,7 @@
"type": "github"
}
],
"time": "2020-09-28T05:52:38+00:00"
"time": "2022-04-03T09:37:03+00:00"
},
{
"name": "sebastian/exporter",

View File

@ -7,4 +7,4 @@ _core:
id: medium
label: 'Default medium date'
locked: false
pattern: 'D, m/d/Y - H:i'
pattern: 'D, d/m/Y - H:i'

View File

@ -0,0 +1,47 @@
uuid: 83c69b0b-e1c3-413d-82df-6cc1d0f8e66c
langcode: en
status: true
dependencies:
config:
- opencase_entities.oc_activity_type.emi
module:
- hide_revision_field
id: oc_activity.emi.default
targetEntityType: oc_activity
bundle: emi
mode: default
content:
name:
type: string_textfield
weight: -3
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
time_taken:
type: number
weight: -3
region: content
settings:
placeholder: ''
third_party_settings: { }
hidden:
activity_date_time: true
client: true
description: true
oc_provider: true
oc_target: true
status: true

View File

@ -17,6 +17,7 @@ dependencies:
- opencase_entities.oc_activity_type.evaluation
module:
- datetime
- hide_revision_field
_core:
default_config_hash: WSYAeo27GpLUUXh-PgaeoOX7BSBtIlkzHsgKXjgDbt4
id: oc_activity.evaluation.default
@ -104,6 +105,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 14
@ -112,10 +125,14 @@ content:
display_label: true
third_party_settings: { }
time_taken:
type: number
weight: 2
region: content
settings:
placeholder: ''
third_party_settings: { }
type: number
hidden: { }
hidden:
client: true
description: true
oc_provider: true
oc_target: true

View File

@ -4,6 +4,8 @@ status: true
dependencies:
config:
- opencase_entities.oc_activity_type.phone_call
module:
- hide_revision_field
id: oc_activity.phone_call.default
targetEntityType: oc_activity
bundle: phone_call
@ -27,6 +29,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
time_taken:
type: number
weight: 1
@ -36,4 +50,7 @@ content:
third_party_settings: { }
hidden:
activity_date_time: true
description: true
oc_provider: true
oc_target: true
status: true

View File

@ -15,6 +15,7 @@ dependencies:
- image.style.thumbnail
- opencase_entities.oc_activity_type.trainer_debrief
module:
- hide_revision_field
- image
id: oc_activity.trainer_debrief.default
targetEntityType: oc_activity
@ -102,6 +103,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 10
@ -112,5 +125,7 @@ content:
hidden:
activity_date_time: true
client: true
description: true
name: true
oc_target: true
time_taken: true

View File

@ -15,6 +15,7 @@ dependencies:
- image.style.thumbnail
- opencase_entities.oc_actor_type.trainer
module:
- hide_revision_field
- image
- paragraphs
_core:
@ -143,6 +144,18 @@ content:
rows: 5
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 13

View File

@ -11,6 +11,7 @@ dependencies:
module:
- datetime
- file
- hide_revision_field
id: oc_case.project.default
targetEntityType: oc_case
bundle: project
@ -27,17 +28,29 @@ content:
placeholder: ''
third_party_settings: { }
field_contract_signed_date:
type: datetime_default
weight: 2
region: content
settings: { }
third_party_settings: { }
type: datetime_default
region: content
files:
type: file_generic
weight: 1
region: content
settings:
progress_indicator: throbber
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
@ -51,4 +64,5 @@ hidden:
field_fee: true
field_total_fee: true
notes: true
oc_target: true
user_id: true

View File

@ -16,6 +16,7 @@ dependencies:
module:
- datetime
- file
- hide_revision_field
_core:
default_config_hash: dxPm53tH_SWeTJgZIfdHIIiEb4vSzqADMzUemllj8rk
id: oc_case.training.default
@ -89,6 +90,18 @@ content:
rows: 5
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 8
@ -100,4 +113,5 @@ hidden:
feeds_item: true
field_number_of_participants: true
field_trainer: true
oc_target: true
user_id: true

View File

@ -5,6 +5,8 @@ dependencies:
config:
- field.field.oc_case_fee.project_fee.feeds_item
- opencase_cases.oc_case_fee_type.project_fee
module:
- hide_revision_field
id: oc_case_fee.project_fee.default
targetEntityType: oc_case_fee
bundle: project_fee
@ -27,8 +29,21 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
hidden:
feeds_item: true
name: true
oc_case: true
status: true
user_id: true

View File

@ -7,6 +7,8 @@ dependencies:
- field.field.oc_case_provision.trainer.field_rate
- field.field.oc_case_provision.trainer.field_rate_type
- opencase_cases.oc_case_provision_type.trainer
module:
- hide_revision_field
id: oc_case_provision.trainer.default
targetEntityType: oc_case_provision
bundle: trainer
@ -51,6 +53,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
hidden:
feeds_item: true
name: true

View File

@ -21,6 +21,7 @@ dependencies:
module:
- datetime
- file
- hide_revision_field
_core:
default_config_hash: OUNi7pV7COebgUedxmuEz4ZF1VF4QDet2AcZ_2j3jQs
id: oc_organisation.client.default
@ -29,90 +30,90 @@ bundle: client
mode: default
content:
field_accreditation_date:
weight: 5
settings: { }
third_party_settings: { }
type: datetime_default
weight: 5
region: content
settings: { }
third_party_settings: { }
field_client_status:
type: options_select
weight: 4
region: content
settings: { }
third_party_settings: { }
type: options_select
region: content
field_client_substatus:
type: options_select
weight: 3
region: content
settings: { }
third_party_settings: { }
type: options_select
region: content
field_client_subtype:
type: options_select
weight: 2
region: content
settings: { }
third_party_settings: { }
type: options_select
region: content
field_client_type:
weight: 1
settings: { }
third_party_settings: { }
type: options_select
weight: 1
region: content
field_how_did_you_hear_about_us:
weight: 12
settings: { }
third_party_settings: { }
field_how_did_you_hear_about_us:
type: options_buttons
weight: 12
region: content
settings: { }
third_party_settings: { }
field_location_festival_event:
weight: 9
settings:
size: 60
placeholder: ''
third_party_settings: { }
type: string_textfield
weight: 9
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
field_number_of_events_per_year:
type: number
weight: 10
region: content
settings:
placeholder: ''
third_party_settings: { }
type: number
region: content
field_number_of_staff:
type: number
weight: 8
region: content
settings:
placeholder: ''
third_party_settings: { }
type: number
region: content
field_premises_capacity:
weight: 7
settings:
placeholder: ''
third_party_settings: { }
type: number
weight: 7
region: content
settings:
placeholder: ''
third_party_settings: { }
field_tags:
type: entity_reference_autocomplete
weight: 11
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
type: entity_reference_autocomplete
region: content
field_umbrella_client:
type: entity_reference_autocomplete
weight: 6
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
type: entity_reference_autocomplete
region: content
name:
type: string_textfield
weight: 0
@ -121,6 +122,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 13

View File

@ -6,6 +6,7 @@ dependencies:
- opencase_entities.oc_organisation_type.partner_organisation
module:
- file
- hide_revision_field
id: oc_organisation.partner_organisation.default
targetEntityType: oc_organisation
bundle: partner_organisation
@ -19,6 +20,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 1

View File

@ -9,6 +9,7 @@ dependencies:
- opencase_entities.oc_organisation_type.umbrella_client
module:
- file
- hide_revision_field
_core:
default_config_hash: OC8jnc4KZMX-3IOvNhREzEIJ2cAagpxmwKeeUoAbYIc
id: oc_organisation.umbrella_client.default
@ -17,21 +18,21 @@ bundle: umbrella_client
mode: default
content:
field_tags:
type: entity_reference_autocomplete
weight: 2
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
type: entity_reference_autocomplete
region: content
field_type_of_umbrella_client:
type: options_select
weight: 1
region: content
settings: { }
third_party_settings: { }
type: options_select
region: content
name:
type: string_textfield
weight: 0
@ -40,6 +41,18 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
revision_log:
type: hide_revision_field_log_widget
weight: 80
region: content
settings:
rows: 5
placeholder: ''
show: false
default: ''
permission_based: false
allow_user_settings: false
third_party_settings: { }
status:
type: boolean_checkbox
weight: 3

View File

@ -80,6 +80,7 @@ module:
views_autosubmit: 0
views_summarize: 0
views_ui: 0
hide_revision_field: 1
password_policy: 10
views: 10
paragraphs: 11

View File

@ -15,7 +15,9 @@ label: 'Rate type'
description: ''
required: false
translatable: false
default_value: { }
default_value:
-
value: custom
default_value_callback: ''
settings: { }
field_type: list_string

View File

@ -3,8 +3,12 @@ langcode: en
status: true
dependencies:
module:
- field_permissions
- opencase_cases
- options
third_party_settings:
field_permissions:
permission_type: public
id: oc_case_provision.field_rate_type
field_name: field_rate_type
entity_type: oc_case_provision

View File

@ -413,7 +413,7 @@ display:
click_sort_column: target_id
type: entity_reference_label
settings:
link: true
link: false
group_column: target_id
group_columns: { }
group_rows: true