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

Issue #2156351 by olli: Unable to delete block.

8.0.x
Alex Pott 2013-12-16 01:04:13 +00:00
parent 5fc0ca8118
commit f048b4a1d0
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/block/lib/Drupal/block/BlockFormController.php
View File

@ -350,6 +350,11 @@ class BlockFormController extends EntityFormController {
'block' => $this->entity->id(), 'block' => $this->entity->id(),
), ),
); );
$query = $this->getRequest()->query;
if ($query->has('destination')) {
$form_state['redirect_route']['options']['query']['destination'] = $query->get('destination');
$query->remove('destination');
}
} }
/** /**

10
core/modules/block/lib/Drupal/block/Tests/BlockTest.php
View File

@ -141,6 +141,16 @@ class BlockTest extends BlockTestBase {
$this->assertRaw(t('Are you sure you want to delete the block %name?', array('%name' => $block['settings[label]']))); $this->assertRaw(t('Are you sure you want to delete the block %name?', array('%name' => $block['settings[label]'])));
$this->drupalPostForm(NULL, array(), t('Delete')); $this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertRaw(t('The block %name has been removed.', array('%name' => $block['settings[label]']))); $this->assertRaw(t('The block %name has been removed.', array('%name' => $block['settings[label]'])));
// Test deleting a block via "Configure block" link.
$block = $this->drupalPlaceBlock('system_powered_by_block');
$this->drupalGet('admin/structure/block/manage/' . $block->id(), array('query' => array('destination' => 'admin')));
$this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertRaw(t('Are you sure you want to delete the block %name?', array('%name' => $block->label())));
$this->drupalPostForm(NULL, array(), t('Delete'));
$this->assertRaw(t('The block %name has been removed.', array('%name' => $block->label())));
$this->assertUrl('admin');
$this->assertNoRaw($block->id());
} }
/** /**