' . $this->t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $this->field->label())) . '
'; - - // Create a form structure for the field values. - $form['field_storage'] = array( - '#prefix' => $description, - '#tree' => TRUE, - ); + $field_label = $form_state->get('field_config')->label(); + $form['#title'] = $field_label; + $form['#prefix'] = '' . $this->t('These settings apply to the %field field everywhere it is used. These settings impact the way that data is stored in the database and cannot be changed once data has been created.', array('%field' => $field_label)) . '
'; // See if data already exists for this field. // If so, prevent changes to the field settings. - if ($field_storage->hasData()) { - $form['field_storage']['#prefix'] = '' . $form['field_storage']['#prefix']; + if ($this->entity->hasData()) { + $form['#prefix'] = '' . $form['#prefix']; } // Add settings provided by the field module. The field module is // responsible for not returning settings that cannot be changed if // the field already has data. - $form['field_storage']['settings'] = array( + $form['settings'] = array( '#weight' => -10, + '#tree' => TRUE, ); // Create an arbitrary entity object, so that we can have an instantiated // FieldItem. - $ids = (object) array('entity_type' => $this->field->entity_type, 'bundle' => $this->field->bundle, 'entity_id' => NULL); + $ids = (object) array('entity_type' => $form_state->get('entity_type_id'), 'bundle' => $form_state->get('bundle'), 'entity_id' => NULL); $entity = _field_create_entity_from_ids($ids); - $items = $entity->get($field_storage->getName()); + $items = $entity->get($this->entity->getName()); $item = $items->first() ?: $items->appendItem(); - $form['field_storage']['settings'] += $item->storageSettingsForm($form, $form_state, $field_storage->hasData()); + $form['settings'] += $item->storageSettingsForm($form, $form_state, $this->entity->hasData()); // Build the configurable field values. - $cardinality = $field_storage->getCardinality(); - $form['field_storage']['cardinality_container'] = array( - // Reset #parents to 'field_storage', so the additional container does not appear. - '#parents' => array('field_storage'), + $cardinality = $this->entity->getCardinality(); + $form['cardinality_container'] = array( + // Reset #parents so the additional container does not appear. + '#parents' => array(), '#type' => 'fieldset', '#title' => $this->t('Allowed number of values'), '#attributes' => array('class' => array( @@ -125,7 +96,7 @@ public function buildForm(array $form, FormStateInterface $form_state, FieldConf 'form-composite' )), ); - $form['field_storage']['cardinality_container']['cardinality'] = array( + $form['cardinality_container']['cardinality'] = array( '#type' => 'select', '#title' => $this->t('Allowed number of values'), '#title_display' => 'invisible', @@ -135,7 +106,7 @@ public function buildForm(array $form, FormStateInterface $form_state, FieldConf ), '#default_value' => ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) ? FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED : 'number', ); - $form['field_storage']['cardinality_container']['cardinality_number'] = array( + $form['cardinality_container']['cardinality_number'] = array( '#type' => 'number', '#default_value' => $cardinality != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED ? $cardinality : 1, '#min' => 1, @@ -144,79 +115,70 @@ public function buildForm(array $form, FormStateInterface $form_state, FieldConf '#size' => 2, '#states' => array( 'visible' => array( - ':input[name="field_storage[cardinality]"]' => array('value' => 'number'), + ':input[name="cardinality"]' => array('value' => 'number'), ), 'disabled' => array( - ':input[name="field_storage[cardinality]"]' => array('value' => -1), + ':input[name="cardinality"]' => array('value' => -1), ), ), ); - // Build the non-configurable field values. - $form['field_storage']['field_name'] = array('#type' => 'value', '#value' => $field_storage->getName()); - $form['field_storage']['type'] = array('#type' => 'value', '#value' => $field_storage->getType()); - $form['field_storage']['module'] = array('#type' => 'value', '#value' => $field_storage->getTypeProvider()); - $form['field_storage']['translatable'] = array('#type' => 'value', '#value' => $field_storage->isTranslatable()); - - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => $this->t('Save field settings'), - '#button_type' => 'primary', - ); return $form; } /** * {@inheritdoc} */ - public function validateForm(array &$form, FormStateInterface $form_state) { + protected function actions(array $form, FormStateInterface $form_state) { + $elements = parent::actions($form, $form_state); + $elements['submit']['#value'] = $this->t('Save field settings'); + + return $elements; + } + + /** + * {@inheritdoc} + */ + public function validate(array $form, FormStateInterface $form_state) { + parent::validate($form, $form_state); + // Validate field cardinality. - $field_values = $form_state->getValue('field_storage'); - $cardinality = $field_values['cardinality']; - $cardinality_number = $field_values['cardinality_number']; - if ($cardinality === 'number' && empty($cardinality_number)) { - $form_state->setErrorByName('field][cardinality_number', $this->t('Number of values is required.')); + if ($form_state->getValue('cardinality') === 'number' && !$form_state->getValue('cardinality_number')) { + $form_state->setErrorByName('cardinality_number', $this->t('Number of values is required.')); } } /** * {@inheritdoc} */ - public function submitForm(array &$form, FormStateInterface $form_state) { - $form_values = $form_state->getValues(); - $field_values = $form_values['field_storage']; - + public function buildEntity(array $form, FormStateInterface $form_state) { // Save field cardinality. - $cardinality = $field_values['cardinality']; - $cardinality_number = $field_values['cardinality_number']; - if ($cardinality === 'number') { - $cardinality = $cardinality_number; + if ($form_state->getValue('cardinality') === 'number') { + $form_state->setValue('cardinality', $form_state->getValue('cardinality_number')); } - $field_values['cardinality'] = $cardinality; - unset($field_values['container']); - // Merge incoming form values into the existing field. - $field_storage = $this->field->getFieldStorageDefinition(); - foreach ($field_values as $key => $value) { - $field_storage->set($key, $value); - } + return parent::buildEntity($form, $form_state); + } - // Update the field. + /** + * {@inheritdoc} + */ + public function save(array $form, FormStateInterface $form_state) { + $field_label = $form_state->get('field_config')->label(); try { - $field_storage->save(); - drupal_set_message($this->t('Updated field %label field settings.', array('%label' => $this->field->label()))); + $this->entity->save(); + drupal_set_message($this->t('Updated field %label field settings.', array('%label' => $field_label))); $request = $this->getRequest(); if (($destinations = $request->query->get('destinations')) && $next_destination = FieldUI::getNextDestination($destinations)) { $request->query->remove('destinations'); $form_state->setRedirectUrl($next_destination); } else { - $form_state->setRedirectUrl(FieldUI::getOverviewRouteInfo($this->field->entity_type, $this->field->bundle)); + $form_state->setRedirectUrl(FieldUI::getOverviewRouteInfo($form_state->get('entity_type_id'), $form_state->get('bundle'))); } } catch (\Exception $e) { - drupal_set_message($this->t('Attempt to update field %label failed: %message.', array('%label' => $this->field->label(), '%message' => $e->getMessage())), 'error'); + drupal_set_message($this->t('Attempt to update field %label failed: %message.', array('%label' => $field_label, '%message' => $e->getMessage())), 'error'); } } diff --git a/core/modules/field_ui/src/Routing/RouteSubscriber.php b/core/modules/field_ui/src/Routing/RouteSubscriber.php index 0904027..84d725b 100644 --- a/core/modules/field_ui/src/Routing/RouteSubscriber.php +++ b/core/modules/field_ui/src/Routing/RouteSubscriber.php @@ -79,8 +79,8 @@ protected function alterRoutes(RouteCollection $collection) { $route = new Route( "$path/fields/{field_config}/storage", - array('_form' => '\Drupal\field_ui\Form\FieldStorageEditForm') + $defaults, - array('_entity_access' => 'field_config.update'), + array('_entity_form' => 'field_storage_config.edit') + $defaults, + array('_permission' => 'administer ' . $entity_type_id . ' fields'), $options ); $collection->add("entity.field_config.{$entity_type_id}_storage_edit_form", $route); diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php index 1a42ce5..6e0b60f 100644 --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -180,7 +180,7 @@ function updateField() { // Populate the field settings with new settings. $string = 'updated dummy test string'; $edit = array( - 'field_storage[settings][test_field_storage_setting]' => $string, + 'settings[test_field_storage_setting]' => $string, ); $this->drupalPostForm(NULL, $edit, t('Save field settings')); @@ -229,22 +229,22 @@ function cardinalitySettings() { // Assert the cardinality other field cannot be empty when cardinality is // set to 'number'. $edit = array( - 'field_storage[cardinality]' => 'number', - 'field_storage[cardinality_number]' => '', + 'cardinality' => 'number', + 'cardinality_number' => '', ); $this->drupalPostForm($field_edit_path, $edit, t('Save field settings')); $this->assertText('Number of values is required.'); // Submit a custom number. $edit = array( - 'field_storage[cardinality]' => 'number', - 'field_storage[cardinality_number]' => 6, + 'cardinality' => 'number', + 'cardinality_number' => 6, ); $this->drupalPostForm($field_edit_path, $edit, t('Save field settings')); $this->assertText('Updated field Body field settings.'); $this->drupalGet($field_edit_path); - $this->assertFieldByXPath("//select[@name='field_storage[cardinality]']", 'number'); - $this->assertFieldByXPath("//input[@name='field_storage[cardinality_number]']", 6); + $this->assertFieldByXPath("//select[@name='cardinality']", 'number'); + $this->assertFieldByXPath("//input[@name='cardinality_number']", 6); // Check that tabs displayed. $this->assertLink(t('Edit')); @@ -254,13 +254,13 @@ function cardinalitySettings() { // Set to unlimited. $edit = array( - 'field_storage[cardinality]' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, + 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, ); $this->drupalPostForm($field_edit_path, $edit, t('Save field settings')); $this->assertText('Updated field Body field settings.'); $this->drupalGet($field_edit_path); - $this->assertFieldByXPath("//select[@name='field_storage[cardinality]']", FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED); - $this->assertFieldByXPath("//input[@name='field_storage[cardinality_number]']", 1); + $this->assertFieldByXPath("//select[@name='cardinality']", FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED); + $this->assertFieldByXPath("//input[@name='cardinality_number']", 1); } /** diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php index 48c94ed..4f468f8 100644 --- a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php +++ b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php @@ -127,7 +127,7 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state '#description' => t('This setting only has an effect if the display option is enabled.'), '#states' => array( 'visible' => array( - ':input[name="field_storage[settings][display_field]"]' => array('checked' => TRUE), + ':input[name="settings[display_field]"]' => array('checked' => TRUE), ), ), ); diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php index f3ae0c4..99b70a6 100644 --- a/core/modules/file/src/Tests/FileFieldWidgetTest.php +++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php @@ -231,7 +231,7 @@ function testPrivateFileSetting() { $test_file = $this->getTestFile('text'); // Change the field setting to make its files private, and upload a file. - $edit = array('field_storage[settings][uri_scheme]' => 'private'); + $edit = array('settings[uri_scheme]' => 'private'); $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$field->id/storage", $edit, t('Save field settings')); $nid = $this->uploadNodeFile($test_file, $field_name, $type_name); $node_storage->resetCache(array($nid)); @@ -246,12 +246,12 @@ function testPrivateFileSetting() { // Ensure we can't change 'uri_scheme' field settings while there are some // entities with uploaded files. $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field->id/storage"); - $this->assertFieldByXpath('//input[@id="edit-field-storage-settings-uri-scheme-public" and @disabled="disabled"]', 'public', 'Upload destination setting disabled.'); + $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and @disabled="disabled"]', 'public', 'Upload destination setting disabled.'); // Delete node and confirm that setting could be changed. $node->delete(); $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field->id/storage"); - $this->assertFieldByXpath('//input[@id="edit-field-storage-settings-uri-scheme-public" and not(@disabled)]', 'public', 'Upload destination setting enabled.'); + $this->assertFieldByXpath('//input[@id="edit-settings-uri-scheme-public" and not(@disabled)]', 'public', 'Upload destination setting enabled.'); } /** @@ -274,7 +274,7 @@ function testPrivateFileComment() { $name = strtolower($this->randomMachineName()); $label = $this->randomMachineName(); - $storage_edit = array('field_storage[settings][uri_scheme]' => 'private'); + $storage_edit = array('settings[uri_scheme]' => 'private'); $this->fieldUIAddNewField('admin/structure/comment/manage/comment', $name, $label, 'file', $storage_edit); // Manually clear cache on the tester side. diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php index 6efc84d..607ad7d 100644 --- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php +++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php @@ -110,7 +110,7 @@ public function testDefaultImages() { $field_id = $field->id(); $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage"); $this->assertFieldByXpath( - '//input[@name="field_storage[settings][default_image][uuid][fids]"]', + '//input[@name="settings[default_image][uuid][fids]"]', $default_images['field']->id(), format_string( 'Article image field default equals expected file ID of @fid.', @@ -131,7 +131,7 @@ public function testDefaultImages() { // Confirm the defaults are present on the page field settings form. $this->drupalGet("admin/structure/types/manage/page/fields/$field_id/storage"); $this->assertFieldByXpath( - '//input[@name="field_storage[settings][default_image][uuid][fids]"]', + '//input[@name="settings[default_image][uuid][fids]"]', $default_images['field']->id(), format_string( 'Page image field default equals expected file ID of @fid.', @@ -183,7 +183,7 @@ public function testDefaultImages() { // Confirm that the new default is used on the article field settings form. $this->drupalGet("admin/structure/types/manage/article/fields/$field_id/storage"); $this->assertFieldByXpath( - '//input[@name="field_storage[settings][default_image][uuid][fids]"]', + '//input[@name="settings[default_image][uuid][fids]"]', $default_images['field_new']->id(), format_string( 'Updated image field default equals expected file ID of @fid.', diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php index 4fef5f5..b88eca2 100644 --- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php @@ -279,7 +279,7 @@ function testImageFieldSettings() { // 1, so we need to make sure the file widget prevents these notices by // providing all settings, even if they are not used. // @see FileWidget::formMultipleElements(). - $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', array('field_storage[cardinality]' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), t('Save field settings')); + $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $field_name . '/storage', array('cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED), t('Save field settings')); $edit = array(); $edit['files[' . $field_name . '_1][]'] = drupal_realpath($test_image->uri); $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published')); @@ -318,9 +318,9 @@ function testImageFieldDefaultImage() { $alt = $this->randomString(512); $title = $this->randomString(1024); $edit = array( - 'files[field_storage_settings_default_image_uuid]' => drupal_realpath($images[0]->uri), - 'field_storage[settings][default_image][alt]' => $alt, - 'field_storage[settings][default_image][title]' => $title, + 'files[settings_default_image_uuid]' => drupal_realpath($images[0]->uri), + 'settings[default_image][alt]' => $alt, + 'settings[default_image][title]' => $title, ); $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings')); // Clear field definition cache so the new default image is detected. @@ -363,7 +363,7 @@ function testImageFieldDefaultImage() { // Remove default image from the field and make sure it is no longer used. $edit = array( - 'field_storage[settings][default_image][uuid][fids]' => 0, + 'settings[default_image][uuid][fids]' => 0, ); $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/storage", $edit, t('Save field settings')); // Clear field definition cache so the new default image is detected. @@ -377,9 +377,9 @@ function testImageFieldDefaultImage() { $this->createImageField($private_field_name, 'article', array('uri_scheme' => 'private')); // Add a default image to the new field. $edit = array( - 'files[field_storage_settings_default_image_uuid]' => drupal_realpath($images[1]->uri), - 'field_storage[settings][default_image][alt]' => $alt, - 'field_storage[settings][default_image][title]' => $title, + 'files[settings_default_image_uuid]' => drupal_realpath($images[1]->uri), + 'settings[default_image][alt]' => $alt, + 'settings[default_image][title]' => $title, ); $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/storage', $edit, t('Save field settings')); // Clear field definition cache so the new default image is detected. diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php index ef2b020..c0ab0df 100644 --- a/core/modules/options/src/Tests/OptionsFieldUITest.php +++ b/core/modules/options/src/Tests/OptionsFieldUITest.php @@ -296,7 +296,7 @@ protected function createOptionsField($type) { * Message to display. */ function assertAllowedValuesInput($input_string, $result, $message) { - $edit = array('field_storage[settings][allowed_values]' => $input_string); + $edit = array('settings[allowed_values]' => $input_string); $this->drupalPostForm($this->adminPath, $edit, t('Save field settings')); $this->assertNoRaw('<', 'The page does not have double escaped HTML tags.'); @@ -320,7 +320,7 @@ function testNodeDisplay() { $on = $this->randomMachineName(); $off = $this->randomMachineName(); $edit = array( - 'field_storage[settings][allowed_values]' => + 'settings[allowed_values]' => "1|$on 0|$off", ); diff --git a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php index 0f8414f..5be5840 100644 --- a/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php +++ b/core/modules/options/src/Tests/OptionsFloatFieldImportTest.php @@ -52,7 +52,7 @@ public function testImport() { $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.staging')); // Set the active to not use dots in the allowed values key names. - $edit = array('field_storage[settings][allowed_values]' => "0|Zero\n1|One"); + $edit = array('settings[allowed_values]' => "0|Zero\n1|One"); $this->drupalPostForm($admin_path, $edit, t('Save field settings')); $field_storage = FieldStorageConfig::loadByName('node', $field_name); $this->assertIdentical($field_storage->getSetting('allowed_values'), $array = array('0' => 'Zero', '1' => 'One'));