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

Issue #2810057 by arijits.drush, Lendude: WSOD after renaming and deleting a views display

8.3.x
Alex Pott 2016-10-11 23:17:57 +01:00
parent b0abe17943
commit db7834de4c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/views_ui/src/Tests/DisplayCRUDTest.php
View File

@ -81,6 +81,16 @@ class DisplayCRUDTest extends UITestBase {
$this->drupalPostForm(NULL, array(), t('Save')); $this->drupalPostForm(NULL, array(), t('Save'));
$this->assertNoLinkByHref($path_prefix . '/page_1', 'Make sure there is no display tab for the deleted display.'); $this->assertNoLinkByHref($path_prefix . '/page_1', 'Make sure there is no display tab for the deleted display.');
// Test deleting a display that has a modified machine name.
$view = $this->randomView();
$machine_name = 'new_machine_name';
$path_prefix = 'admin/structure/views/view/' . $view['id'] . '/edit';
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/display_id", array('display_id' => $machine_name), 'Apply');
$this->drupalPostForm(NULL, array(), 'Delete Page');
$this->drupalPostForm(NULL, array(), t('Save'));
$this->assertResponse(200);
$this->assertNoLinkByHref($path_prefix . '/new_machine_name', 'Make sure there is no display tab for the deleted display.');
} }
/** /**

2
core/modules/views_ui/src/ViewEditForm.php
View File

@ -266,7 +266,7 @@ class ViewEditForm extends ViewFormBase {
// Rename display ids if needed. // Rename display ids if needed.
foreach ($executable->displayHandlers as $id => $display) { foreach ($executable->displayHandlers as $id => $display) {
if (!empty($display->display['new_id'])) { if (!empty($display->display['new_id']) && empty($display->display['deleted'])) {
$new_id = $display->display['new_id']; $new_id = $display->display['new_id'];
$display->display['id'] = $new_id; $display->display['id'] = $new_id;
unset($display->display['new_id']); unset($display->display['new_id']);