Commit f048b4a1 authored by alexpott's avatar alexpott

Issue #2156351 by olli: Unable to delete block.

parent 5fc0ca81
......@@ -350,6 +350,11 @@ public function delete(array $form, array &$form_state) {
'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');
}
}
/**
......
......@@ -141,6 +141,16 @@ function testBlock() {
$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->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());
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment