Skip to content
Snippets Groups Projects
Commit 29c35383 authored by Matthew Radcliffe's avatar Matthew Radcliffe
Browse files

Issue #3372652 by mradcliffe, slowflyer: Calling the user_agreements view leads to WSOD

parent 4e6e155a
No related branches found
No related tags found
1 merge request!15Issue #3372652 by mradcliffe, slowflyer: Updates default views for Drupal 10 to fix missing display ids
Pipeline #144168 passed with warnings
......@@ -6,6 +6,8 @@
*/
use Drupal\Core\Config\Entity\ConfigEntityUpdater;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\views\ViewEntityInterface;
/**
* Fixes translatable schema types from "string" to "label".
......@@ -15,7 +17,7 @@ function agreement_post_update_fix_translatable_schema(&$sandbox = NULL) {
// Saving each agreement should be enough.
\Drupal::classResolver(ConfigEntityUpdater::class)
->update($sandbox, 'agreement');
return t('Updated all agreements.');
return new TranslatableMarkup('Updated all agreements.');
}
return NULL;
}
......@@ -27,7 +29,34 @@ function agreement_post_update_update_frequency_type(&$sandbox = NULL) {
if (\Drupal::moduleHandler()->moduleExists('agreement')) {
\Drupal::classResolver(ConfigEntityUpdater::class)
->update($sandbox, 'agreement');
return t('Updated all agreements');
return new TranslatableMarkup('Updated all agreements');
}
return NULL;
}
/**
* Updates display id if it is null for all agreement views.
*/
function agreement_post_update_updates_default_views(&$sandbox = NULL) {
if (\Drupal::moduleHandler()->moduleExists('agreement') &&
\Drupal::moduleHandler()->moduleExists(('views'))) {
// Updates views owned by agreement module that have displays with null ids.
\Drupal::classResolver(ConfigEntityUpdater::class)
->update($sandbox, 'view', function (ViewEntityInterface $view) {
if ($view->get('module') === 'agreement') {
/** @var \Drupal\views\Plugin\views\display\DisplayPluginInterface[] $displays */
$displays = $view->get('display');
foreach ($displays as $id => $display) {
if (!$display['id']) {
$displays[$id]['id'] = $id;
}
}
$view->set('display', $displays);
return TRUE;
}
return FALSE;
});
}
return NULL;
}
langcode: en
status: true
dependencies:
module:
- agreement
- user
id: agreements
label: Agreements
module: agreement
......@@ -11,111 +5,14 @@ description: 'Display agreement records.'
tag: ''
base_table: users_field_data
base_field: uid
core: 8.x
display:
default:
display_plugin: default
id: default
display_title: Master
display_plugin: default
position: 0
display_options:
access:
type: perm
options:
perm: 'administer agreements'
cache:
type: tag
options: { }
query:
type: views_query
options:
disable_sql_rewrite: false
distinct: false
replica: false
query_comment: ''
query_tags: { }
exposed_form:
type: basic
options:
submit_button: Apply
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
pager:
type: mini
options:
items_per_page: 50
offset: 0
id: 0
total_pages: null
tags:
previous: ‹‹
next: ››
expose:
items_per_page: false
items_per_page_label: 'Items per page'
items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
style:
type: table
options:
grouping: { }
row_class: ''
default_row_class: true
override: true
sticky: false
caption: ''
summary: ''
description: ''
columns:
name: name
type: type
agreed_date: agreed_date
agreed: agreed
info:
name:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
type:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
agreed_date:
sortable: true
default_sort_order: desc
align: ''
separator: ''
empty_column: false
responsive: ''
agreed:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
default: agreed_date
empty_table: true
row:
type: fields
options:
inline: { }
separator: ''
hide_empty: false
default_field_elements: true
title: 'Agreement Records'
fields:
name:
id: name
......@@ -124,6 +21,9 @@ display:
relationship: none
group_type: group
admin_label: ''
entity_type: user
entity_field: name
plugin_id: field
label: User
exclude: false
alter:
......@@ -179,9 +79,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
entity_type: user
entity_field: name
plugin_id: field
type:
id: type
table: agreement
......@@ -189,6 +86,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: agreement_entity
label: Agreement
exclude: false
alter:
......@@ -232,7 +130,6 @@ display:
hide_alter_empty: true
display:
- label
plugin_id: agreement_entity
agreed_date:
id: agreed_date
table: agreement
......@@ -240,6 +137,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: date
label: 'Agreed On'
exclude: false
alter:
......@@ -284,7 +182,6 @@ display:
date_format: fallback
custom_date_format: ''
timezone: ''
plugin_id: date
agreed:
id: agreed
table: agreement
......@@ -292,6 +189,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: boolean
label: 'Has Agreed'
exclude: false
alter:
......@@ -337,7 +235,44 @@ display:
type_custom_true: ''
type_custom_false: ''
not: false
plugin_id: boolean
pager:
type: mini
options:
offset: 0
items_per_page: 50
total_pages: null
id: 0
tags:
next: ››
previous: ‹‹
expose:
items_per_page: false
items_per_page_label: 'Items per page'
items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
exposed_form:
type: basic
options:
submit_button: Apply
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
access:
type: perm
options:
perm: 'administer agreements'
cache:
type: tag
options: { }
empty: { }
sorts: { }
arguments: { }
filters:
type:
id: type
......@@ -346,6 +281,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: in_operator
operator: in
value: { }
group: 1
......@@ -377,7 +313,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
plugin_id: in_operator
agreed:
id: agreed
table: agreement
......@@ -385,6 +320,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: boolean
operator: '='
value: All
group: 1
......@@ -415,7 +351,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
plugin_id: boolean
status:
id: status
table: users_field_data
......@@ -423,6 +358,9 @@ display:
relationship: none
group_type: group
admin_label: ''
entity_type: user
entity_field: status
plugin_id: boolean
operator: '='
value: '1'
group: 1
......@@ -453,9 +391,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
plugin_id: boolean
entity_type: user
entity_field: status
uid:
id: uid
table: users_field_data
......@@ -463,6 +398,9 @@ display:
relationship: none
group_type: group
admin_label: ''
entity_type: user
entity_field: uid
plugin_id: user_name
operator: in
value: { }
group: 1
......@@ -494,21 +432,76 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
entity_type: user
entity_field: uid
plugin_id: user_name
sorts: { }
header: { }
footer: { }
empty: { }
relationships: { }
arguments: { }
display_extenders: { }
title: 'Agreement Records'
filter_groups:
operator: AND
groups:
1: AND
style:
type: table
options:
grouping: { }
row_class: ''
default_row_class: true
columns:
name: name
type: type
agreed_date: agreed_date
agreed: agreed
default: agreed_date
info:
name:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
type:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
agreed_date:
sortable: true
default_sort_order: desc
align: ''
separator: ''
empty_column: false
responsive: ''
agreed:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
override: true
sticky: false
summary: ''
empty_table: true
caption: ''
description: ''
row:
type: fields
options:
default_field_elements: true
inline: { }
separator: ''
hide_empty: false
query:
type: views_query
options:
query_comment: ''
disable_sql_rewrite: false
distinct: false
replica: false
query_tags: { }
relationships: { }
header: { }
footer: { }
display_extenders: { }
cache_metadata:
max-age: -1
contexts:
......@@ -519,9 +512,9 @@ display:
- user.permissions
tags: { }
page_1:
display_plugin: page
id: page_1
display_title: Page
display_plugin: page
position: 1
display_options:
display_extenders: { }
......@@ -530,11 +523,11 @@ display:
type: tab
title: Agreements
description: 'Agreement records for an agreement.'
weight: 0
expanded: false
menu_name: admin
parent: agreement.admin
weight: 0
context: '0'
menu_name: admin
cache_metadata:
max-age: -1
contexts:
......
langcode: en
status: true
dependencies:
module:
- agreement
- user
id: user_agreements
label: 'User Agreements'
module: agreement
......@@ -11,93 +5,14 @@ description: 'List agreement records for an user in a tab on their user profile.
tag: ''
base_table: users_field_data
base_field: uid
core: 8.x
display:
default:
display_plugin: default
id: default
display_title: Master
display_plugin: default
position: 0
display_options:
access:
type: none
options: { }
cache:
type: tag
options: { }
query:
type: views_query
options:
disable_sql_rewrite: false
distinct: false
replica: false
query_comment: ''
query_tags: { }
exposed_form:
type: basic
options:
submit_button: Apply
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
pager:
type: mini
options:
items_per_page: 50
offset: 0
id: 0
total_pages: null
tags:
previous: ‹‹
next: ››
expose:
items_per_page: false
items_per_page_label: 'Items per page'
items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
style:
type: table
options:
grouping: { }
row_class: ''
default_row_class: true
override: true
sticky: false
caption: ''
summary: ''
description: ''
columns:
type: type
agreed_date: agreed_date
info:
type:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: true
responsive: ''
agreed_date:
sortable: true
default_sort_order: desc
align: ''
separator: ''
empty_column: true
responsive: ''
default: agreed_date
empty_table: true
row:
type: fields
options:
inline: { }
separator: ''
hide_empty: false
default_field_elements: true
title: 'My Agreements'
fields:
type:
id: type
......@@ -106,6 +21,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: agreement_entity
label: Agreement
exclude: false
alter:
......@@ -149,7 +65,6 @@ display:
hide_alter_empty: true
display:
- label
plugin_id: agreement_entity
agreed_date:
id: agreed_date
table: agreement
......@@ -157,6 +72,7 @@ display:
relationship: none
group_type: group
admin_label: ''
plugin_id: date
label: 'Agreed On'
exclude: false
alter:
......@@ -201,24 +117,42 @@ display:
date_format: html_date
custom_date_format: ''
timezone: ''
plugin_id: date
filters:
status:
value: '1'
table: users_field_data
field: status
plugin_id: boolean
entity_type: user
entity_field: status
id: status
pager:
type: mini
options:
offset: 0
items_per_page: 50
total_pages: null
id: 0
tags:
next: ››
previous: ‹‹
expose:
operator: ''
group: 1
sorts: { }
header: { }
footer: { }
items_per_page: false
items_per_page_label: 'Items per page'
items_per_page_options: '5, 10, 25, 50'
items_per_page_options_all: false
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
exposed_form:
type: basic
options:
submit_button: Apply
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
expose_sort_order: true
sort_asc_label: Asc
sort_desc_label: Desc
access:
type: none
options: { }
cache:
type: tag
options: { }
empty: { }
relationships: { }
sorts: { }
arguments:
uid:
id: uid
......@@ -227,6 +161,9 @@ display:
relationship: none
group_type: group
admin_label: ''
entity_type: user
entity_field: uid
plugin_id: user_uid
default_action: 'not found'
exception:
value: ''
......@@ -241,8 +178,8 @@ display:
summary_options:
base_path: ''
count: true
items_per_page: 25
override: false
items_per_page: 25
summary:
sort_order: asc
number_of_records: 0
......@@ -259,11 +196,68 @@ display:
roles: { }
break_phrase: false
not: false
filters:
status:
id: status
table: users_field_data
field: status
entity_type: user
entity_field: uid
plugin_id: user_uid
entity_field: status
plugin_id: boolean
value: '1'
group: 1
expose:
operator: ''
style:
type: table
options:
grouping: { }
row_class: ''
default_row_class: true
columns:
type: type
agreed_date: agreed_date
default: agreed_date
info:
type:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: true
responsive: ''
agreed_date:
sortable: true
default_sort_order: desc
align: ''
separator: ''
empty_column: true
responsive: ''
override: true
sticky: false
summary: ''
empty_table: true
caption: ''
description: ''
row:
type: fields
options:
default_field_elements: true
inline: { }
separator: ''
hide_empty: false
query:
type: views_query
options:
query_comment: ''
disable_sql_rewrite: false
distinct: false
replica: false
query_tags: { }
relationships: { }
header: { }
footer: { }
display_extenders: { }
title: 'My Agreements'
cache_metadata:
max-age: -1
contexts:
......@@ -272,9 +266,9 @@ display:
- url.query_args
tags: { }
page_1:
display_plugin: page
id: page_1
display_title: Page
display_plugin: page
position: 1
display_options:
display_extenders: { }
......@@ -283,11 +277,11 @@ display:
type: tab
title: Agreements
description: ''
weight: 0
expanded: false
menu_name: account
parent: user.page
weight: 0
context: '0'
menu_name: account
cache_metadata:
max-age: -1
contexts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment