diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index 2fbe6f7..09107a7 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -201,7 +201,7 @@ public function delete(array &$form, array &$form_state) { $destination = drupal_get_destination(); $request->query->remove('destination'); } - $form_state['redirect'] = array('admin/structure/types/manage/' . $this->instance['bundle'] . '/fields/' . $this->instance->id() . '/delete', array('query' => $destination)); + $form_state['redirect'] = array('admin/structure/types/manage/' . $this->instance->bundle . '/fields/' . $this->instance->id() . '/delete', array('query' => $destination)); } /** diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php index 1a8f65e..ec5ef3d 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php @@ -74,6 +74,7 @@ function testCRUDFields() { $this->addExistingField(); $this->cardinalitySettings(); $this->fieldListAdminPage(); + $this->deleteFieldInstance(); } /** @@ -209,6 +210,17 @@ function cardinalitySettings() { } /** + * Tests deleting a field from the instance edit form. + */ + protected function deleteFieldInstance() { + // Delete the field instance. + $instance_id = 'node.' . $this->type . '.' . $this->field_name; + $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $instance_id); + $this->drupalPost(NULL, array(), t('Delete field')); + $this->assertResponse(200); + } + + /** * Asserts field settings are as expected. * * @param $bundle