diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php index 90be985..bf0c3a3 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php @@ -745,6 +745,8 @@ protected function getExistingFieldOptions() { } } } + + return $info; } } diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php index 8e8d890..1ff80ad 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php @@ -7,21 +7,13 @@ namespace Drupal\field_ui\Form; -use Drupal\Core\Form\FormInterface; -use Drupal\field\Plugin\Core\Entity\FieldInstance; +use Drupal\field\FieldInstanceInterface; use Drupal\field\Field; /** * Provides a form for the field settings edit page. */ -class FieldEditForm implements FormInterface { - - /** - * The field instance being edited. - * - * @var \Drupal\field\Plugin\Core\Entity\FieldInstance - */ - protected $instance; +class FieldEditForm extends FieldInstanceFormBase { /** * {@inheritdoc} @@ -33,8 +25,9 @@ public function getFormID() { /** * {@inheritdoc} */ - public function buildForm(array $form, array &$form_state, FieldInstance $field_instance = NULL) { - $this->instance = $form_state['instance'] = $field_instance; + public function buildForm(array $form, array &$form_state, FieldInstanceInterface $field_instance = NULL) { + parent::buildForm($form, $form_state, $field_instance); + $field = $this->instance->getField(); $form['#field'] = $field; @@ -128,7 +121,6 @@ public function validateForm(array &$form, array &$form_state) { * {@inheritdoc} */ public function submitForm(array &$form, array &$form_state) { - form_load_include($form_state, 'inc', 'field_ui', 'field_ui.admin'); $form_values = $form_state['values']; $field_values = $form_values['field']; @@ -152,7 +144,7 @@ public function submitForm(array &$form, array &$form_state) { try { $field->save(); drupal_set_message(t('Updated field %label field settings.', array('%label' => $this->instance->label()))); - $form_state['redirect'] = field_ui_next_destination($this->instance->entity_type, $this->instance->bundle); + $form_state['redirect'] = $this->getNextDestination(); } catch (Exception $e) { drupal_set_message(t('Attempt to update field %label failed: %message.', array('%label' => $this->instance->label(), '%message' => $e->getMessage())), 'error');