Skip to content

Commit

Permalink
Merge branch 'feature/OPS-11043-group-v3' of github.com:UN-OCHA/iasc8…
Browse files Browse the repository at this point in the history
… into feature/OPS-11043-group-v3
  • Loading branch information
lazysoundsystem committed Jan 2, 2025
2 parents cb8c950 + 1c380e4 commit 8066755
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions config/core.entity_form_display.node.action_point.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand Down Expand Up @@ -103,7 +103,7 @@ content:
autocomplete: false
match_operator: CONTAINS
third_party_settings: { }
group_content_access:
group_relationship_access:
type: options_select
weight: 13
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand All @@ -38,7 +38,7 @@ hidden:
field_contact: true
field_date: true
field_iasc_audience: true
group_content_access: true
group_relationship_access: true
langcode: true
og_group_ref: true
search_api_excerpt: true
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand All @@ -38,7 +38,7 @@ hidden:
field_contact: true
field_date: true
field_iasc_audience: true
group_content_access: true
group_relationship_access: true
langcode: true
og_group_ref: true
search_api_excerpt: true
4 changes: 2 additions & 2 deletions config/core.entity_view_display.node.action_point.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand Down Expand Up @@ -88,7 +88,7 @@ content:
third_party_settings: { }
weight: 1
region: content
group_content_access:
group_relationship_access:
type: list_default
label: above
settings: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand All @@ -38,7 +38,7 @@ hidden:
field_contact: true
field_date: true
field_iasc_audience: true
group_content_access: true
group_relationship_access: true
langcode: true
og_group_ref: true
search_api_excerpt: true
4 changes: 2 additions & 2 deletions config/core.entity_view_display.node.action_point.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand Down Expand Up @@ -89,7 +89,7 @@ content:
third_party_settings: { }
weight: 1
region: content
group_content_access:
group_relationship_access:
type: list_default
label: above
settings: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand Down Expand Up @@ -46,7 +46,7 @@ hidden:
field_contact: true
field_date: true
field_iasc_audience: true
group_content_access: true
group_relationship_access: true
langcode: true
og_group_ref: true
search_api_excerpt: true
4 changes: 2 additions & 2 deletions config/core.entity_view_display.node.action_point.teaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- field.field.node.action_point.field_contact
- field.field.node.action_point.field_date
- field.field.node.action_point.field_iasc_audience
- field.field.node.action_point.group_content_access
- field.field.node.action_point.group_relationship_access
- field.field.node.action_point.og_group_ref
- node.type.action_point
module:
Expand Down Expand Up @@ -46,7 +46,7 @@ hidden:
field_contact: true
field_date: true
field_iasc_audience: true
group_content_access: true
group_relationship_access: true
langcode: true
og_group_ref: true
search_api_excerpt: true
2 changes: 1 addition & 1 deletion config/diff.plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ fields:
show_header: 1
markdown: drupal_html_to_text
compare_entity_reference: 1
group_content_access:
group_relationship_access:
type: list_field_diff_builder
settings:
show_header: 1
Expand Down
4 changes: 2 additions & 2 deletions config/facets.facet.changed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: true
dependencies:
config:
- search_api.index.default_solr_index
- views.view.iasc_group_content
- views.view.iasc_group_relationship
module:
- search_api
id: changed
Expand All @@ -14,7 +14,7 @@ min_count: 1
missing: false
missing_label: others
url_alias: changed
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
facet_source_id: 'search_api:views_page__iasc_group_relationship__page_documents'
field_identifier: changed
query_operator: or
hard_limit: 0
Expand Down
4 changes: 2 additions & 2 deletions config/facets.facet.document_type_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: true
dependencies:
config:
- search_api.index.default_solr_index
- views.view.iasc_group_content
- views.view.iasc_group_relationship
module:
- search_api
id: document_type_label
Expand All @@ -14,7 +14,7 @@ min_count: 1
missing: false
missing_label: others
url_alias: document_type_label
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
facet_source_id: 'search_api:views_page__iasc_group_relationship__page_documents'
field_identifier: document_type_label
query_operator: or
hard_limit: 0
Expand Down
4 changes: 2 additions & 2 deletions config/facets.facet.product_category_label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: true
dependencies:
config:
- search_api.index.default_solr_index
- views.view.iasc_group_content
- views.view.iasc_group_relationship
module:
- search_api
id: product_category_label
Expand All @@ -14,7 +14,7 @@ min_count: 1
missing: false
missing_label: others
url_alias: product_category_label
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
facet_source_id: 'search_api:views_page__iasc_group_relationship__page_documents'
field_identifier: product_category_label
query_operator: or
hard_limit: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ uuid: ed748bdf-a24c-4990-b93f-79c60be1cca2
langcode: en
status: true
dependencies: { }
id: search_api__views_page__iasc_group_content__page_documents
name: 'search_api:views_page__iasc_group_content__page_documents'
id: search_api__views_page__iasc_group_relationship__page_documents
name: 'search_api:views_page__iasc_group_relationship__page_documents'
filter_key: null
url_processor: query_string
breadcrumb: { }
4 changes: 2 additions & 2 deletions config/facets_summary.facets_summary.document_summary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ status: true
dependencies:
config:
- search_api.index.default_solr_index
- views.view.iasc_group_content
- views.view.iasc_group_relationship
module:
- search_api
id: document_summary
name: 'Document summary'
facet_source_id: 'search_api:views_page__iasc_group_content__page_documents'
facet_source_id: 'search_api:views_page__iasc_group_relationship__page_documents'
processor_configs:
hide_when_not_rendered:
processor_id: hide_when_not_rendered
Expand Down
6 changes: 3 additions & 3 deletions config/field.field.node.action_point.group_content_access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ langcode: en
status: true
dependencies:
config:
- field.storage.node.group_content_access
- field.storage.node.group_relationship_access
- node.type.action_point
module:
- options
id: node.action_point.group_content_access
field_name: group_content_access
id: node.action_point.group_relationship_access
field_name: group_relationship_access
entity_type: node
bundle: action_point
label: 'Group content visibility'
Expand Down
2 changes: 1 addition & 1 deletion config/field.field.paragraph.view.field_view.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ settings:
group_members: '0'
group_nodes: '0'
iasc_content: '0'
iasc_group_content: '0'
iasc_group_relationship: '0'
iasc_tasks: '0'
media: '0'
media_library: '0'
Expand Down
4 changes: 2 additions & 2 deletions config/field.storage.node.group_content_access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies:
module:
- node
- options
id: node.group_content_access
field_name: group_content_access
id: node.group_relationship_access
field_name: group_relationship_access
entity_type: node
type: list_integer
settings:
Expand Down

0 comments on commit 8066755

Please sign in to comment.