From c03683d8194f447b891822053c9cc3ac07d60f5a Mon Sep 17 00:00:00 2001 From: naomi Date: Sun, 10 Jul 2022 14:25:23 +0100 Subject: [PATCH] activities config and user role stuff --- ...isplay.oc_activity.application.default.yml | 13 ++------ ..._display.oc_activity.case_note.default.yml | 13 ++------ ...ity.destitution_funds_provided.default.yml | 27 +++++++++------- ...view_display.oc_activity.email.default.yml | 2 +- ..._display.oc_activity.interview.default.yml | 25 ++++++++------- ..._view_display.oc_activity.lete.default.yml | 25 ++++++++------- ...w_display.oc_activity.research.default.yml | 2 +- config/optional/system.site.yml | 2 +- config/optional/user.role.authenticated.yml | 31 ------------------- config/optional/views.view.actors.yml | 10 ++++-- config/optional/views.view.cases.yml | 10 ++++-- config/optional/views.view.events.yml | 10 ++++-- config/optional/views.view.organisations.yml | 10 ++++-- 13 files changed, 84 insertions(+), 96 deletions(-) diff --git a/config/optional/core.entity_view_display.oc_activity.application.default.yml b/config/optional/core.entity_view_display.oc_activity.application.default.yml index 0feabec..b8fbb36 100644 --- a/config/optional/core.entity_view_display.oc_activity.application.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.application.default.yml @@ -25,7 +25,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 5 + weight: 4 region: content name: type: string @@ -33,17 +33,9 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 4 - region: content - oc_provider: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } weight: 2 region: content - oc_target: + oc_provider: type: entity_reference_label label: above settings: @@ -63,6 +55,7 @@ content: weight: 3 region: content hidden: + oc_target: true search_api_excerpt: true status: true user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.case_note.default.yml b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml index 8401adf..11e8f0f 100644 --- a/config/optional/core.entity_view_display.oc_activity.case_note.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml @@ -25,7 +25,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 5 + weight: 4 region: content name: type: string @@ -33,17 +33,9 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 4 - region: content - oc_provider: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } weight: 2 region: content - oc_target: + oc_provider: type: entity_reference_label label: above settings: @@ -63,6 +55,7 @@ content: weight: 3 region: content hidden: + oc_target: true search_api_excerpt: true status: true user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml index 0bd3c06..b17bfbd 100644 --- a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml @@ -39,14 +39,14 @@ content: scale: 2 prefix_suffix: true third_party_settings: { } - weight: 5 + weight: 4 region: content field_funds_for: type: list_default label: above settings: { } third_party_settings: { } - weight: 4 + weight: 3 region: content name: type: string @@ -54,17 +54,9 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 3 + weight: 2 region: content oc_provider: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 2 - region: content - oc_target: type: entity_reference_label label: above settings: @@ -72,8 +64,19 @@ content: third_party_settings: { } weight: 1 region: content + time_taken: + type: number_decimal + label: above + settings: + thousand_separator: '' + decimal_separator: . + scale: 2 + prefix_suffix: true + third_party_settings: { } + weight: 5 + region: content hidden: + oc_target: true search_api_excerpt: true status: true - time_taken: true user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.email.default.yml b/config/optional/core.entity_view_display.oc_activity.email.default.yml index f15d7e3..2d70bc6 100644 --- a/config/optional/core.entity_view_display.oc_activity.email.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.email.default.yml @@ -29,7 +29,7 @@ content: region: content name: type: string - label: above + label: hidden settings: link_to_entity: false third_party_settings: { } diff --git a/config/optional/core.entity_view_display.oc_activity.interview.default.yml b/config/optional/core.entity_view_display.oc_activity.interview.default.yml index 4f5b642..ea8cf7c 100644 --- a/config/optional/core.entity_view_display.oc_activity.interview.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.interview.default.yml @@ -29,21 +29,13 @@ content: region: content name: type: string - label: above + label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 3 + weight: 2 region: content oc_provider: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 2 - region: content - oc_target: type: entity_reference_label label: above settings: @@ -51,8 +43,19 @@ content: third_party_settings: { } weight: 1 region: content + time_taken: + type: number_decimal + label: above + settings: + thousand_separator: '' + decimal_separator: . + scale: 2 + prefix_suffix: true + third_party_settings: { } + weight: 3 + region: content hidden: + oc_target: true search_api_excerpt: true status: true - time_taken: true user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.lete.default.yml b/config/optional/core.entity_view_display.oc_activity.lete.default.yml index a5c4340..439d057 100644 --- a/config/optional/core.entity_view_display.oc_activity.lete.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.lete.default.yml @@ -29,21 +29,13 @@ content: region: content name: type: string - label: above + label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 3 + weight: 2 region: content oc_provider: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 2 - region: content - oc_target: type: entity_reference_label label: above settings: @@ -51,8 +43,19 @@ content: third_party_settings: { } weight: 1 region: content + time_taken: + type: number_decimal + label: above + settings: + thousand_separator: '' + decimal_separator: . + scale: 2 + prefix_suffix: true + third_party_settings: { } + weight: 3 + region: content hidden: + oc_target: true search_api_excerpt: true status: true - time_taken: true user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.research.default.yml b/config/optional/core.entity_view_display.oc_activity.research.default.yml index 0a47fc1..2d00846 100644 --- a/config/optional/core.entity_view_display.oc_activity.research.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.research.default.yml @@ -29,7 +29,7 @@ content: region: content name: type: string - label: above + label: hidden settings: link_to_entity: false third_party_settings: { } diff --git a/config/optional/system.site.yml b/config/optional/system.site.yml index 10c0d47..35ba558 100644 --- a/config/optional/system.site.yml +++ b/config/optional/system.site.yml @@ -8,7 +8,7 @@ slogan: '' page: 403: /user/login 404: '' - front: /opencase/actors/client + front: /opencase/my-cases admin_compact_mode: false weight_select_max: 100 default_langcode: en diff --git a/config/optional/user.role.authenticated.yml b/config/optional/user.role.authenticated.yml index 889a689..1b0c014 100644 --- a/config/optional/user.role.authenticated.yml +++ b/config/optional/user.role.authenticated.yml @@ -26,43 +26,12 @@ permissions: - 'access shortcuts' - 'access site-wide contact form' - 'add activity entities' - - 'add case entities' - - 'add client entities' - - 'add equal opps entities' - - 'add event entities' - - 'add organisation entities' - - 'add staff_member entities' - - 'add volunteer entities' - 'edit activity entities' - - 'edit bank account entities' - - 'edit case entities' - - 'edit client entities' - - 'edit equal opps entities' - - 'edit event entities' - - 'edit organisation entities' - - 'edit staff_member entities' - - 'edit volunteer entities' - 'post comments' - - 'revert all activity revisions' - - 'revert all client revisions' - - 'revert all organisation revisions' - - 'revert all staff_member revisions' - - 'revert all volunteer revisions' - 'search content' - 'skip comment approval' - 'use opencase' - 'use text format basic_html' - - 'view all activity revisions' - - 'view all client revisions' - - 'view all organisation revisions' - - 'view all staff_member revisions' - - 'view all volunteer revisions' - 'view published activity entities' - 'view published case provision entities' - - 'view published client entities' - - 'view published equal opps entities' - - 'view published event entities' - 'view published organisation entities' - - 'view published organisation relation entities' - - 'view published staff_member entities' - - 'view published volunteer entities' diff --git a/config/optional/views.view.actors.yml b/config/optional/views.view.actors.yml index d67fa8c..163aaf6 100644 --- a/config/optional/views.view.actors.yml +++ b/config/optional/views.view.actors.yml @@ -3,7 +3,10 @@ langcode: en status: true dependencies: config: - - user.role.authenticated + - user.role.administrator + - user.role.opencase_admin + - user.role.overseer + - user.role.volunteer_co_ord module: - opencase_entities - user @@ -186,7 +189,10 @@ display: type: role options: role: - authenticated: authenticated + administrator: administrator + overseer: overseer + volunteer_co_ord: volunteer_co_ord + opencase_admin: opencase_admin cache: type: tag options: { } diff --git a/config/optional/views.view.cases.yml b/config/optional/views.view.cases.yml index 1228512..cc7d1e7 100644 --- a/config/optional/views.view.cases.yml +++ b/config/optional/views.view.cases.yml @@ -4,7 +4,10 @@ status: true dependencies: config: - system.menu.opencase - - user.role.authenticated + - user.role.administrator + - user.role.opencase_admin + - user.role.overseer + - user.role.volunteer_co_ord module: - opencase_cases - user @@ -318,7 +321,10 @@ display: type: role options: role: - authenticated: authenticated + administrator: administrator + overseer: overseer + volunteer_co_ord: volunteer_co_ord + opencase_admin: opencase_admin cache: type: tag options: { } diff --git a/config/optional/views.view.events.yml b/config/optional/views.view.events.yml index 51d07b0..d51c52c 100644 --- a/config/optional/views.view.events.yml +++ b/config/optional/views.view.events.yml @@ -3,7 +3,10 @@ langcode: en status: true dependencies: config: - - user.role.authenticated + - user.role.administrator + - user.role.opencase_admin + - user.role.overseer + - user.role.volunteer_co_ord module: - opencase_entities - user @@ -120,7 +123,10 @@ display: type: role options: role: - authenticated: authenticated + administrator: administrator + overseer: overseer + volunteer_co_ord: volunteer_co_ord + opencase_admin: opencase_admin cache: type: tag options: { } diff --git a/config/optional/views.view.organisations.yml b/config/optional/views.view.organisations.yml index dfa18c6..d811636 100644 --- a/config/optional/views.view.organisations.yml +++ b/config/optional/views.view.organisations.yml @@ -3,7 +3,10 @@ langcode: en status: true dependencies: config: - - user.role.authenticated + - user.role.administrator + - user.role.opencase_admin + - user.role.overseer + - user.role.volunteer_co_ord module: - opencase_entities - user @@ -120,7 +123,10 @@ display: type: role options: role: - authenticated: authenticated + administrator: administrator + overseer: overseer + volunteer_co_ord: volunteer_co_ord + opencase_admin: opencase_admin cache: type: tag options: { }