diff options
Diffstat (limited to 'modules/field_ui/field_ui.admin.inc')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 137 |
1 files changed, 49 insertions, 88 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index 1a7a1131d..1cf31a79b 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -1121,18 +1121,7 @@ function field_ui_field_edit_form($form, &$form_state, $obj_type, $bundle, $inst // Add handling for default value if not provided by any other module. if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT && empty($instance['default_value_function'])) { - // Store the original default value for use in programmed forms. The - // '#default_value' property is used instead of '#value' so programmed - // values can override whatever we set here. - $form['instance']['default_value'] = array( - '#type' => 'value', - '#default_value' => $instance['default_value'], - ); - - // We cannot tell at the time we build the form if this is a programmed form - // or not, so we always end up adding the default value widget even if we - // will not use it. - field_ui_default_value_widget($field, $instance, $form, $form_state); + $form['instance']['default_value_widget'] = field_ui_default_value_widget($field, $instance, $form, $form_state); } $has_data = field_has_data($field); @@ -1207,7 +1196,9 @@ function field_ui_field_edit_instance_pre_render($element) { * Build default value fieldset. */ function field_ui_default_value_widget($field, $instance, &$form, &$form_state) { - $form['instance']['default_value_widget'] = array( + $field_name = $field['field_name']; + + $element = array( '#type' => 'fieldset', '#title' => t('Default value'), '#collapsible' => FALSE, @@ -1215,106 +1206,76 @@ function field_ui_default_value_widget($field, $instance, &$form, &$form_state) '#description' => t('The default value for this field, used when creating new content.'), ); - // Make sure the default value is not a required field. + // Insert the widget. + $items = $instance['default_value']; $instance['required'] = FALSE; $instance['description'] = ''; - $items = $instance['default_value']; - // Set up form info that the default value widget will need. - $form['#fields'] = array( - $field['field_name'] => array( - 'field' => $field, - 'instance' => $instance, - ), - ); - function_exists('field_default_form'); // @todo Allow multiple values (requires more work on 'add more' JS handler). - $widget_form = field_default_form(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state, 0); - $form['instance']['default_value_widget'] += $widget_form; - $form['#fields'][$field['field_name']]['form_path'] = array( - 'instance', - 'default_value_widget', - $field['field_name'], - ); + $element += field_default_form(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state, 0); + + // Adjust 'form_path' to reflect the actual location of the widget in the + // form structure. + $form['#fields'][$field_name]['form_path'] = array('instance', 'default_value_widget', $field_name); + + return $element; } /** - * Validate a field's settings. + * Form validation handler for field instance settings form. */ function field_ui_field_edit_form_validate($form, &$form_state) { - $form_values = $form_state['values']; - $instance = $form_values['instance']; - $field = field_info_field($instance['field_name']); - $field_type = field_info_field_types($field['type']); - $widget_type = field_info_widget_types($instance['widget']['type']); + $instance = $form_state['values']['instance']; - // Do no validation here. Assume field and widget modules are handling their - // own validation of form settings. - - // If field.module is handling the default value, validate the result using - // the field validation. - if (field_behaviors_widget('default value', $instance) == FIELD_BEHAVIOR_DEFAULT) { - // If this is a programmed form, get rid of the default value widget, we - // have the default values already. - if (!empty($form_state['programmed'])) { - form_set_value(array('#parents' => array('instance', 'widget', 'default_value_widget')), NULL, $form_state); - return; - } + // Validate the default value. + if (!empty($instance['default_value_widget'])) { + $field = field_info_field($instance['field_name']); - if (!empty($form_values['instance']['widget']['default_value_widget'])) { - // Fields that handle their own multiple values may use an expected value - // as the top-level key, so just pop off the top element. - $key = array_shift(array_keys($form_values['instance']['widget']['default_value_widget'])); - $default_value = $form_values['instance']['widget']['default_value_widget'][$key]; - $is_code = FALSE; - form_set_value(array('#parents' => array('instance', 'widget', 'default_value')), $default_value, $form_state); - } + // Extract field values. + $items = array(); + $form_state_copy = array('values' => $instance['default_value_widget']); + field_default_extract_form_values(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state_copy); - if (isset($default_value)) { - $node = array(); - $node[$field['field_name']] = $default_value; - $field['required'] = FALSE; - $field_function = $field_type['module'] . '_field'; - $errors_before = form_get_errors(); - - // Widget now does its own validation, should be no need to add anything - // for widget validation here. - if (function_exists($field_function)) { - $field_function('validate', $node, $field, $default_value, $form, NULL); - } - // The field validation routine won't set an error on the right field, so - // set it here. - $errors_after = form_get_errors(); - if (count($errors_after) > count($errors_before)) { - form_set_error('default_value', t('The default value is invalid.')); - } + // Validate the values and report errors. + $errors = array(); + $function = $field['module'] . '_field_validate'; + if (function_exists($function)) { + $function(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $errors); + } + if ($errors) { + field_default_form_errors(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $errors); } } } /** - * Save instance settings after editing. + * Form submit handler for field instance settings form. */ function field_ui_field_edit_form_submit($form, &$form_state) { - $form_values = $form_state['values']; - $field_values = $form_values['field']; - $instance_values = $form_values['instance']; - $field_name = $instance_values['field_name']; + $instance = $form_state['values']['instance']; + $field = $form_state['values']['field']; // Update any field settings that have changed. - $field = field_info_field($instance_values['field_name']); - $field = array_merge($field, $field_values); + $field_source = field_info_field($instance['field_name']); + $field = array_merge($field_source, $field); field_update_field($field); - // Move the default value from the sample widget to the default value field. - if (isset($instance_values['default_value_widget'])) { - $langcode = $form['instance']['default_value_widget'][$field_name]['#language']; - $instance_values['default_value'] = $instance_values['default_value_widget'][$field_name][$langcode]; - unset($instance_values['default_value_widget']); + // Handle the default value. + if (!empty($instance['default_value_widget'])) { + // Extract field values. + $items = array(); + $form_state_copy = array('values' => $instance['default_value_widget']); + field_default_extract_form_values(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state_copy); + + // Prepare field values. + field_default_submit(NULL, NULL, $field, $instance, FIELD_LANGUAGE_NONE, $items, $form, $form_state_copy); + + $instance['default_value'] = $items ? $items : NULL; + unset($instance['default_value_widget']); } // Update the instance settings. - $instance = field_info_instance($instance_values['object_type'], $instance_values['field_name'], $instance_values['bundle']); - $instance = array_merge($instance, $instance_values); + $instance_source = field_info_instance($instance['object_type'], $instance['field_name'], $instance['bundle']); + $instance = array_merge($instance_source, $instance); field_update_instance($instance); drupal_set_message(t('Saved %label configuration.', array('%label' => $instance['label']))); |