opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.0.0. For more information, see https://www.drupal.org/node/2619030

Browse source
This commit is contained in:
Pantheon Automation 2015-11-19 07:04:44 -08:00 • committed by Greg Anderson
parent 7784f4c23d
commit 25a6735fb3
49 changed files with 1394 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/modules/block_content/src/BlockContentViewsData.php
View file

@ -36,25 +36,24 @@ class BlockContentViewsData extends EntityViewsData {
),
);
// Advertise this table as a possible base table.
$data['block_content_revision']['table']['base']['help'] = $this->t('Block Content revision is a history of changes to block content.');
$data['block_content_revision']['table']['base']['defaults']['title'] = 'info';
$data['block_content_field_revision']['table']['base']['help'] = $this->t('Block Content revision is a history of changes to block content.');
$data['block_content_field_revision']['table']['base']['defaults']['title'] = 'info';
// @todo EntityViewsData should add these relationships by default.
// https://www.drupal.org/node/2410275
$data['block_content_revision']['id']['relationship']['id'] = 'standard';
$data['block_content_revision']['id']['relationship']['base'] = 'block_content';
$data['block_content_revision']['id']['relationship']['base field'] = 'id';
$data['block_content_revision']['id']['relationship']['title'] = $this->t('Block Content');
$data['block_content_revision']['id']['relationship']['label'] = $this->t('Get the actual block content from a block content revision.');
$data['block_content_field_revision']['id']['relationship']['id'] = 'standard';
$data['block_content_field_revision']['id']['relationship']['base'] = 'block_content_field_data';
$data['block_content_field_revision']['id']['relationship']['base field'] = 'id';
$data['block_content_field_revision']['id']['relationship']['title'] = $this->t('Block Content');
$data['block_content_field_revision']['id']['relationship']['label'] = $this->t('Get the actual block content from a block content revision.');
$data['block_content_revision']['revision_id']['relationship']['id'] = 'standard';
$data['block_content_revision']['revision_id']['relationship']['base'] = 'block_content';
$data['block_content_revision']['revision_id']['relationship']['base field'] = 'revision_id';
$data['block_content_revision']['revision_id']['relationship']['title'] = $this->t('Block Content');
$data['block_content_revision']['revision_id']['relationship']['label'] = $this->t('Get the actual block content from a block content revision.');
$data['block_content_field_revision']['revision_id']['relationship']['id'] = 'standard';
$data['block_content_field_revision']['revision_id']['relationship']['base'] = 'block_content_field_data';
$data['block_content_field_revision']['revision_id']['relationship']['base field'] = 'revision_id';
$data['block_content_field_revision']['revision_id']['relationship']['title'] = $this->t('Block Content');
$data['block_content_field_revision']['revision_id']['relationship']['label'] = $this->t('Get the actual block content from a block content revision.');
return $data;
}
}

8
core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
View file

@ -60,7 +60,7 @@ class RevisionRelationshipsTest extends ViewTestBase {
$column_map = array(
'revision_id' => 'revision_id',
'id_1' => 'id_1',
'block_content_block_content_revision_id' => 'block_content_block_content_revision_id',
'block_content_field_data_block_content_field_revision_id' => 'block_content_field_data_block_content_field_revision_id',
);
// Here should be two rows.
@ -70,12 +70,12 @@ class RevisionRelationshipsTest extends ViewTestBase {
array(
'revision_id' => '1',
'id_1' => '1',
'block_content_block_content_revision_id' => '1',
'block_content_field_data_block_content_field_revision_id' => '1',
),
array(
'revision_id' => '2',
'id_1' => '1',
'block_content_block_content_revision_id' => '1',
'block_content_field_data_block_content_field_revision_id' => '1',
),
);
$this->assertIdenticalResultset($view_id, $resultset_id, $column_map);
@ -87,7 +87,7 @@ class RevisionRelationshipsTest extends ViewTestBase {
array(
'revision_id' => '2',
'id_1' => '1',
'block_content_block_content_revision_id' => '1',
'block_content_field_data_block_content_field_revision_id' => '1',
),
);
$this->assertIdenticalResultset($view_revision_id, $resultset_revision_id, $column_map);

21
core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_id.yml
View file

@ -8,7 +8,7 @@ label: null
module: views
description: ''
tag: ''
base_table: block_content_revision
base_table: block_content_field_revision
base_field: revision_id
core: '8'
display:
@ -17,28 +17,28 @@ display:
relationships:
id:
id: id
table: block_content_revision
table: block_content_field_revision
field: id
required: true
plugin_id: standard
fields:
revision_id:
id: revision_id
table: block_content_revision
table: block_content_field_revision
field: revision_id
plugin_id: field
entity_type: block_content
entity_field: revision_id
id_1:
id: id_1
table: block_content_revision
table: block_content_field_revision
field: id
plugin_id: field
entity_type: block_content
entity_field: id
id:
id: id
table: block_content
table: block_content_field_data
field: id
relationship: id
plugin_id: field
@ -47,11 +47,20 @@ display:
arguments:
id:
id: id
table: block_content_revision
table: block_content_field_revision
field: id
plugin_id: numeric
entity_type: block_content
entity_field: id
sorts:
revision_id:
id: revision_id
table: block_content_field_revision
field: revision_id
order: ASC
plugin_id: field
entity_type: block_content
entity_field: revision_id
display_plugin: default
display_title: Master
id: default

21
core/modules/block_content/tests/modules/block_content_test_views/test_views/views.view.test_block_content_revision_revision_id.yml
View file

@ -8,7 +8,7 @@ label: null
module: views
description: ''
tag: ''
base_table: block_content_revision
base_table: block_content_field_revision
base_field: revision_id
core: '8'
display:
@ -17,7 +17,7 @@ display:
relationships:
revision_id:
id: revision_id
table: block_content_revision
table: block_content_field_revision
field: revision_id
required: true
entity_type: block_content
@ -26,21 +26,21 @@ display:
fields:
revision_id:
id: revision_id
table: block_content_revision
table: block_content_field_revision
field: revision_id
plugin_id: field
entity_type: block_content
entity_field: revision_id
id_1:
id: id_1
table: block_content_revision
table: block_content_field_revision
field: id
plugin_id: field
entity_type: block_content
entity_field: id
id:
id: id
table: block_content
table: block_content_field_data
field: id
relationship: revision_id
plugin_id: field
@ -49,11 +49,20 @@ display:
arguments:
id:
id: id
table: block_content_revision
table: block_content_field_revision
field: id
plugin_id: block_content_id
entity_type: block_content
entity_field: id
sorts:
revision_id:
id: revision_id
table: block_content_field_revision
field: revision_id
order: ASC
plugin_id: field
entity_type: block_content
entity_field: revision_id
display_extenders: { }
display_plugin: default
display_title: Master