Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2870410 by tim.plunkett: Field UI should show fields with unknown regions in the "Disabled" section

8.4.x
Alex Pott 2017-04-29 21:07:40 +01:00
parent 4971d77637
commit 992ed45b26
4 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/field_layout/tests/modules/field_layout_test/field_layout_test.module Normal file
View File

@ -0,0 +1,16 @@
<?php
/**
* @file
* Contains hook implementations for field_layout_test.
*/
/**
* Implements hook_layout_alter().
*/
function field_layout_test_layout_alter(&$definitions) {
/** @var \Drupal\Core\Layout\LayoutDefinition[] $definitions */
if (\Drupal::state()->get('field_layout_test.alter_regions') && isset($definitions['layout_onecol'])) {
$definitions['layout_onecol']->setRegions(['foo' => ['label' => 'Foo']]);
}
}

18
core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
View File

@ -14,7 +14,7 @@ class FieldLayoutTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
public static $modules = ['field_layout', 'field_ui', 'node'];
public static $modules = ['field_layout', 'field_ui', 'node', 'field_layout_test'];
/**
* {@inheritdoc}
@ -57,6 +57,22 @@ class FieldLayoutTest extends BrowserTestBase {
$this->assertSession()->optionExists('fields[body][region]', 'content');
}
/**
* Tests that changes to the regions still leave the fields visible.
*/
public function testRegionChanges() {
$this->drupalGet('admin/structure/types/manage/article/display');
$this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
$this->assertSession()->optionExists('fields[body][region]', 'content');
\Drupal::state()->set('field_layout_test.alter_regions', TRUE);
\Drupal::service('plugin.cache_clearer')->clearCachedDefinitions();
$this->drupalGet('admin/structure/types/manage/article/display');
$this->assertEquals(['Foo', 'Disabled'], $this->getRegionTitles());
$this->assertSession()->optionExists('fields[body][region]', 'hidden');
}
/**
* Gets the region titles on the page.
*

2
core/modules/field_ui/src/Element/FieldUiTable.php
View File

@ -67,7 +67,7 @@ class FieldUiTable extends Table {
unset($list[$name]);
// Determine the region for the row.
$region_name = call_user_func($row['#region_callback'], $row);
$region_name = call_user_func_array($row['#region_callback'], [&$row]);
// Add the element in the tree.
$target = &$trees[$region_name][''];

10
core/modules/field_ui/src/Form/EntityDisplayFormBase.php
View File

@ -817,12 +817,12 @@ abstract class EntityDisplayFormBase extends EntityForm {
* @return string|null
* The region name this row belongs to.
*/
public function getRowRegion($row) {
switch ($row['#row_type']) {
case 'field':
case 'extra_field':
return $row['region']['#value'] ?: 'hidden';
public function getRowRegion(&$row) {
$regions = $this->getRegions();
if (!isset($regions[$row['region']['#value']])) {
$row['region']['#value'] = 'hidden';
}
return $row['region']['#value'];
}
/**