diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc index d3cabf3..5b4953f 100644 --- a/core/modules/field_ui/field_ui.admin.inc +++ b/core/modules/field_ui/field_ui.admin.inc @@ -589,7 +589,7 @@ function field_ui_field_settings_form($form, &$form_state, $instance) { } $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save field settings')); + $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save global field settings')); return $form; } diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index a04c0dd..8afdc8a 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -125,9 +125,9 @@ function field_ui_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'file' => 'field_ui.admin.inc', ) + $access; - $items["$path/fields/%field_ui_menu/field-settings"] = array( + $items["$path/fields/%field_ui_menu/global-settings"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), - 'title' => 'Field settings', + 'title' => 'Global settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_settings_form', $field_position), 'type' => MENU_LOCAL_TASK, 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 a977df9..b01458b 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php @@ -135,8 +135,8 @@ public function form(array $form, array &$form_state) { 'type' => array( '#type' => 'link', '#title' => t($field_types[$field['type']]['label']), - '#href' => $admin_field_path . '/field-settings', - '#options' => array('attributes' => array('title' => t('Edit field settings.'))), + '#href' => $admin_field_path . '/global-settings', + '#options' => array('attributes' => array('title' => t('Edit global field settings.'))), ), 'widget_type' => array( '#type' => 'link', @@ -593,9 +593,9 @@ public function submit(array $form, array &$form_state) { ->setComponent($field['field_name']) ->save(); - // Always show the field settings step, as the cardinality needs to be - // configured for new fields. - $destinations[] = $this->adminPath. '/fields/' . $field['field_name'] . '/field-settings'; + // Always show the global field settings step, as the cardinality needs + // to be configured for new fields. + $destinations[] = $this->adminPath. '/fields/' . $field['field_name'] . '/global-settings'; $destinations[] = $this->adminPath . '/fields/' . $field['field_name']; // Store new field information for any additional submit handlers. diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php index aa923f1..330388e 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php @@ -76,7 +76,7 @@ function fieldUIAddNewField($bundle_path, $initial_edit, $field_edit = array(), $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), 'Field settings page was displayed.'); // Second step : 'Field settings' form. - $this->drupalPost(NULL, $field_edit, t('Save field settings')); + $this->drupalPost(NULL, $field_edit, t('Save global field settings')); $this->assertRaw(t('Updated field %label field settings.', array('%label' => $label)), 'Redirected to instance and widget settings page.'); // Third step : 'Instance settings' form. 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 7298c36..a05b7d8 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 @@ -124,14 +124,14 @@ function createField() { */ function updateField() { // Go to the field edit page. - $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $this->field_name . '/field-settings'); + $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $this->field_name . '/global-settings'); // Populate the field settings with new settings. $string = 'updated dummy test string'; $edit = array( 'field[settings][test_field_setting]' => $string, ); - $this->drupalPost(NULL, $edit, t('Save field settings')); + $this->drupalPost(NULL, $edit, t('Save global field settings')); // Go to the field instance edit page. $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $this->field_name); @@ -176,7 +176,7 @@ function addExistingField() { * numeric value. That is tested already in FormTest::testNumber(). */ function cardinalitySettings() { - $field_edit_path = 'admin/structure/types/manage/article/fields/body/field-settings'; + $field_edit_path = 'admin/structure/types/manage/article/fields/body/global-settings'; // Assert the cardinality other field cannot be empty when cardinality is // set to other. @@ -184,7 +184,7 @@ function cardinalitySettings() { 'field[container][cardinality]' => 'other', 'field[container][cardinality_other]' => '', ); - $this->drupalPost($field_edit_path, $edit, t('Save field settings')); + $this->drupalPost($field_edit_path, $edit, t('Save global field settings')); $this->assertText('Number of values is required.'); // Assert the cardinality field is set to 'Other' when the value is greater @@ -193,7 +193,7 @@ function cardinalitySettings() { 'field[container][cardinality]' => 'other', 'field[container][cardinality_other]' => 16, ); - $this->drupalPost($field_edit_path, $edit, t('Save field settings')); + $this->drupalPost($field_edit_path, $edit, t('Save global field settings')); $this->assertText('Updated field Body field settings.'); $this->drupalGet($field_edit_path); $this->assertFieldByXPath("//select[@name='field[container][cardinality]']", 'other'); @@ -205,7 +205,7 @@ function cardinalitySettings() { 'field[container][cardinality]' => 3, 'field[container][cardinality_other]' => 16, ); - $this->drupalPost($field_edit_path, $edit, t('Save field settings')); + $this->drupalPost($field_edit_path, $edit, t('Save global field settings')); $this->assertText('Updated field Body field settings.'); $this->drupalGet($field_edit_path); $this->assertFieldByXPath("//select[@name='field[container][cardinality]']", 3); diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php index 7fcf35f..1aa23af 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php @@ -218,7 +218,7 @@ function testPrivateFileSetting() { // Change the field setting to make its files private, and upload a file. $edit = array('field[settings][uri_scheme]' => 'private'); - $this->drupalPost("admin/structure/types/manage/$type_name/fields/$field_name/field-settings", $edit, t('Save field settings')); + $this->drupalPost("admin/structure/types/manage/$type_name/fields/$field_name/global-settings", $edit, t('Save global field settings')); $nid = $this->uploadNodeFile($test_file, $field_name, $type_name); $node = node_load($nid, TRUE); $node_file = file_load($node->{$field_name}[LANGUAGE_NOT_SPECIFIED][0]['fid']); @@ -230,12 +230,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_name/field-settings"); + $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_name/global-settings"); $this->assertFieldByXpath('//input[@id="edit-field-settings-uri-scheme-public" and @disabled="disabled"]', 'public', t('Upload destination setting disabled.')); // Delete node and confirm that setting could be changed. node_delete($nid); - $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_name/field-settings"); + $this->drupalGet("admin/structure/types/manage/$type_name/fields/$field_name/global-settings"); $this->assertFieldByXpath('//input[@id="edit-field-settings-uri-scheme-public" and not(@disabled)]', 'public', t('Upload destination setting enabled.')); } @@ -260,7 +260,7 @@ function testPrivateFileComment() { ); $this->drupalPost('admin/structure/types/manage/article/comment/fields', $edit, t('Save')); $edit = array('field[settings][uri_scheme]' => 'private'); - $this->drupalPost(NULL, $edit, t('Save field settings')); + $this->drupalPost(NULL, $edit, t('Save global field settings')); $this->drupalPost(NULL, array(), t('Save settings')); // Create node. diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php index 01fa5f4..30e5eba 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php @@ -74,7 +74,7 @@ function testDefaultImages() { ->save(); // Confirm the defaults are present on the article field settings form. - $this->drupalGet("admin/structure/types/manage/article/fields/$field_name/field-settings"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_name/global-settings"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fid]"]', $default_images['field']->fid, @@ -95,7 +95,7 @@ function testDefaultImages() { ); // Confirm the defaults are present on the page field settings form. - $this->drupalGet("admin/structure/types/manage/page/fields/$field_name/field-settings"); + $this->drupalGet("admin/structure/types/manage/page/fields/$field_name/global-settings"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fid]"]', $default_images['field']->fid, @@ -144,7 +144,7 @@ function testDefaultImages() { field_update_field($field); // Confirm that the new default is used on the article field settings form. - $this->drupalGet("admin/structure/types/manage/article/fields/$field_name/field-settings"); + $this->drupalGet("admin/structure/types/manage/article/fields/$field_name/global-settings"); $this->assertFieldByXpath( '//input[@name="field[settings][default_image][fid]"]', $default_images['field_new']->fid, diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php index 1cfda9f..58a009f 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php @@ -229,7 +229,7 @@ function testImageFieldDefaultImage() { $edit = array( 'files[field_settings_default_image]' => drupal_realpath($images[0]->uri), ); - $this->drupalPost("admin/structure/types/manage/article/fields/$field_name/field-settings", $edit, t('Save field settings')); + $this->drupalPost("admin/structure/types/manage/article/fields/$field_name/global-settings", $edit, t('Save global field settings')); // Clear field info cache so the new default image is detected. field_info_cache_clear(); $field = field_info_field($field_name); @@ -257,7 +257,7 @@ function testImageFieldDefaultImage() { $edit = array( 'field[settings][default_image][fid]' => 0, ); - $this->drupalPost("admin/structure/types/manage/article/fields/$field_name/field-settings", $edit, t('Save field settings')); + $this->drupalPost("admin/structure/types/manage/article/fields/$field_name/global-settings", $edit, t('Save global field settings')); // Clear field info cache so the new default image is detected. field_info_cache_clear(); $field = field_info_field($field_name); @@ -270,7 +270,7 @@ function testImageFieldDefaultImage() { $edit = array( 'files[field_settings_default_image]' => drupal_realpath($images[1]->uri), ); - $this->drupalPost('admin/structure/types/manage/article/fields/' . $private_field_name . '/field-settings', $edit, t('Save field settings')); + $this->drupalPost('admin/structure/types/manage/article/fields/' . $private_field_name . '/global-settings', $edit, t('Save global field settings')); // Clear field info cache so the new default image is detected. field_info_cache_clear(); diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php index 8723bbf..a28d1ad 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php @@ -245,7 +245,7 @@ protected function createOptionsField($type) { ); field_create_instance($instance); - $this->admin_path = 'admin/structure/types/manage/' . $this->type . '/fields/' . $this->field_name . '/field-settings'; + $this->admin_path = 'admin/structure/types/manage/' . $this->type . '/fields/' . $this->field_name . '/global-settings'; } /** diff --git a/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php b/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php index 43340fb..bb0adfe 100644 --- a/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php +++ b/core/modules/text/lib/Drupal/text/Tests/TextTranslationTest.php @@ -91,7 +91,7 @@ function testTextField() { function testTextFieldFormatted() { // Make node body multiple. $edit = array('field[container][cardinality]' => -1); - $this->drupalPost('admin/structure/types/manage/article/fields/body/field-settings', $edit, t('Save field settings')); + $this->drupalPost('admin/structure/types/manage/article/fields/body/global-settings', $edit, t('Save global field settings')); $this->drupalGet('node/add/article'); $this->assertFieldByXPath("//input[@name='body_add_more']", t('Add another item'), 'Body field cardinality set to multiple.');