From 84ec923fbe8b6eaf89b5e66e07b39af9ce5c56dd Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 3 Apr 2022 15:05:38 +0100 Subject: [PATCH 1/4] updated opencase --- .drone.yml | 2 +- composer.lock | 56 +++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index c4cd1f8..2bb425c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,4 +32,4 @@ steps: trigger: branch: - - master + - dev diff --git a/composer.lock b/composer.lock index 3d7637a..521352d 100644 --- a/composer.lock +++ b/composer.lock @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "65fe65474ea48f1cc53707f8db10f7ed9a7d4bbc" + "reference": "13ddf5aa133227b3ed7eb662f9f5eaeb4abd3d5b" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-03-17T10:41:39+00:00" + "time": "2022-04-03T13:51:38+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -164,16 +164,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": { @@ -220,9 +220,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", @@ -458,16 +458,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": { @@ -487,7 +487,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "4.x-dev" + "dev-main": "5.x-dev" } }, "autoload": { @@ -508,9 +508,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", @@ -10555,16 +10555,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": { @@ -10642,7 +10642,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": [ { @@ -10654,7 +10654,7 @@ "type": "github" } ], - "time": "2022-03-15T09:57:31+00:00" + "time": "2022-04-01T12:37:26+00:00" }, { "name": "sebastian/cli-parser", @@ -11022,16 +11022,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": { @@ -11073,7 +11073,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": [ { @@ -11081,7 +11081,7 @@ "type": "github" } ], - "time": "2020-09-28T05:52:38+00:00" + "time": "2022-04-03T09:37:03+00:00" }, { "name": "sebastian/exporter", @@ -12034,5 +12034,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From acc8939710e9369f1d8b865e595d247cfd883b9f Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 3 Apr 2022 18:19:53 +0100 Subject: [PATCH 2/4] updated opencase, also now trainer rate type defaults to custom --- composer.lock | 4 ++-- .../field.field.oc_case_provision.trainer.field_rate_type.yml | 4 +++- config/field.storage.oc_case_provision.field_rate_type.yml | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index 521352d..d7c01b3 100644 --- a/composer.lock +++ b/composer.lock @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "13ddf5aa133227b3ed7eb662f9f5eaeb4abd3d5b" + "reference": "614293c11478bb2fe950cdbf9c1c637b7dabd6cc" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-04-03T13:51:38+00:00" + "time": "2022-04-03T16:52:12+00:00" }, { "name": "bjeavons/zxcvbn-php", diff --git a/config/field.field.oc_case_provision.trainer.field_rate_type.yml b/config/field.field.oc_case_provision.trainer.field_rate_type.yml index 7bee225..5bfef0f 100644 --- a/config/field.field.oc_case_provision.trainer.field_rate_type.yml +++ b/config/field.field.oc_case_provision.trainer.field_rate_type.yml @@ -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 diff --git a/config/field.storage.oc_case_provision.field_rate_type.yml b/config/field.storage.oc_case_provision.field_rate_type.yml index f56ecb0..291df24 100644 --- a/config/field.storage.oc_case_provision.field_rate_type.yml +++ b/config/field.storage.oc_case_provision.field_rate_type.yml @@ -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 From 9c773cd81f75f8f2544af47aa482a3b25be124b5 Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 3 Apr 2022 18:45:33 +0100 Subject: [PATCH 3/4] remove link from tags in client list --- config/views.view.all_clients.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/views.view.all_clients.yml b/config/views.view.all_clients.yml index c672874..bf79790 100644 --- a/config/views.view.all_clients.yml +++ b/config/views.view.all_clients.yml @@ -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 From 3e324dbe7ff22dcb2e81829b4b74461328b10964 Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 3 Apr 2022 19:33:46 +0100 Subject: [PATCH 4/4] changed default medium date format, and updated opencase --- composer.json | 1 + composer.lock | 50 ++++++++++++- config/core.date_format.medium.yml | 2 +- ...y_form_display.oc_activity.emi.default.yml | 47 ++++++++++++ ...display.oc_activity.evaluation.default.yml | 21 +++++- ...display.oc_activity.phone_call.default.yml | 17 +++++ ...ay.oc_activity.trainer_debrief.default.yml | 15 ++++ ..._form_display.oc_actor.trainer.default.yml | 13 ++++ ...y_form_display.oc_case.project.default.yml | 18 ++++- ..._form_display.oc_case.training.default.yml | 14 ++++ ...isplay.oc_case_fee.project_fee.default.yml | 15 ++++ ...play.oc_case_provision.trainer.default.yml | 14 ++++ ...display.oc_organisation.client.default.yml | 75 +++++++++++-------- ...anisation.partner_organisation.default.yml | 13 ++++ ...c_organisation.umbrella_client.default.yml | 21 +++++- config/core.extension.yml | 1 + 16 files changed, 294 insertions(+), 43 deletions(-) create mode 100644 config/core.entity_form_display.oc_activity.emi.default.yml diff --git a/composer.json b/composer.json index 02aa0f7..ea469f5 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index d7c01b3..388e6d8 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "763f86c57bad62b0767502334ded29a7", + "content-hash": "cae722cdc05e4e2525a003694a33aa1d", "packages": [ { "name": "asm89/stack-cors", @@ -94,7 +94,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "614293c11478bb2fe950cdbf9c1c637b7dabd6cc" + "reference": "34b7a1c7c9a56926bd47e0b024b443033e397d1c" }, "require": { "composer/installers": "*", @@ -111,7 +111,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-04-03T16:52:12+00:00" + "time": "2022-04-03T18:27:43+00:00" }, { "name": "bjeavons/zxcvbn-php", @@ -3220,6 +3220,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", diff --git a/config/core.date_format.medium.yml b/config/core.date_format.medium.yml index a325c5e..254550e 100644 --- a/config/core.date_format.medium.yml +++ b/config/core.date_format.medium.yml @@ -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' diff --git a/config/core.entity_form_display.oc_activity.emi.default.yml b/config/core.entity_form_display.oc_activity.emi.default.yml new file mode 100644 index 0000000..e0bf8a5 --- /dev/null +++ b/config/core.entity_form_display.oc_activity.emi.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_activity.evaluation.default.yml b/config/core.entity_form_display.oc_activity.evaluation.default.yml index 9541807..d40a465 100644 --- a/config/core.entity_form_display.oc_activity.evaluation.default.yml +++ b/config/core.entity_form_display.oc_activity.evaluation.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_activity.phone_call.default.yml b/config/core.entity_form_display.oc_activity.phone_call.default.yml index 338cb38..5033f8b 100644 --- a/config/core.entity_form_display.oc_activity.phone_call.default.yml +++ b/config/core.entity_form_display.oc_activity.phone_call.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml index 351c44e..bf03939 100644 --- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml +++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_actor.trainer.default.yml b/config/core.entity_form_display.oc_actor.trainer.default.yml index e0b6e49..77d2ef9 100644 --- a/config/core.entity_form_display.oc_actor.trainer.default.yml +++ b/config/core.entity_form_display.oc_actor.trainer.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_case.project.default.yml b/config/core.entity_form_display.oc_case.project.default.yml index d05cf33..5fcb965 100644 --- a/config/core.entity_form_display.oc_case.project.default.yml +++ b/config/core.entity_form_display.oc_case.project.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_case.training.default.yml b/config/core.entity_form_display.oc_case.training.default.yml index 2b4acd0..5d69a14 100644 --- a/config/core.entity_form_display.oc_case.training.default.yml +++ b/config/core.entity_form_display.oc_case.training.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml index 44d8368..a12b22e 100644 --- a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml +++ b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_case_provision.trainer.default.yml b/config/core.entity_form_display.oc_case_provision.trainer.default.yml index 1a13615..3b456e0 100644 --- a/config/core.entity_form_display.oc_case_provision.trainer.default.yml +++ b/config/core.entity_form_display.oc_case_provision.trainer.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_organisation.client.default.yml b/config/core.entity_form_display.oc_organisation.client.default.yml index a41dc3b..ade4f13 100644 --- a/config/core.entity_form_display.oc_organisation.client.default.yml +++ b/config/core.entity_form_display.oc_organisation.client.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml b/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml index 710325c..ef73caa 100644 --- a/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml +++ b/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml @@ -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 diff --git a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml index e1a2728..8a10374 100644 --- a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml +++ b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml @@ -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 diff --git a/config/core.extension.yml b/config/core.extension.yml index 115a217..a1439c6 100644 --- a/config/core.extension.yml +++ b/config/core.extension.yml @@ -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