diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-20 16:19:24 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-20 16:19:24 +0000 |
| commit | 4a187d271bcab4c5eead39a9d303722e216bcb5e (patch) | |
| tree | 3189324122a400ae5ef90bf50fdcaf0bb0d1cb1b /modules | |
| parent | 816752c5f907ccd3c7b72c230fba7031076f4723 (diff) | |
| download | brdo-4a187d271bcab4c5eead39a9d303722e216bcb5e.tar.gz brdo-4a187d271bcab4c5eead39a9d303722e216bcb5e.tar.bz2 | |
#936536 by rszrama, sun, yched: Fixed Missing #empty_option on a couple selects.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 6 | ||||
| -rw-r--r-- | modules/image/image.field.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 1 | ||||
| -rw-r--r-- | modules/trigger/trigger.admin.inc | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index 8db42d697..ffa7330f6 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -338,6 +338,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#title' => t('Parent for @title', array('@title' => $instance['label'])), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#parents' => array('fields', $name, 'parent'), ), @@ -406,6 +407,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#title' => t('Parent for @title', array('@title' => $extra_field['label'])), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#parents' => array('fields', $name, 'parent'), ), @@ -465,6 +467,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#title' => t('Parent for new field'), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#prefix' => '<div class="add-new-placeholder"> </div>', '#parents' => array('fields', $name, 'parent'), @@ -544,6 +547,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle '#title' => t('Parent for existing field'), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#prefix' => '<div class="add-new-placeholder"> </div>', '#parents' => array('fields', $name, 'parent'), @@ -916,6 +920,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund '#title' => t('Label display for @title', array('@title' => $instance['label'])), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#parents' => array('fields', $name, 'parent'), ), @@ -1077,6 +1082,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund '#title' => t('Parents for @title', array('@title' => $extra_field['label'])), '#title_display' => 'invisible', '#options' => $table['#parent_options'], + '#empty_value' => '', '#attributes' => array('class' => array('field-parent')), '#parents' => array('fields', $name, 'parent'), ), diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc index ce8217bab..1aa127512 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -278,6 +278,7 @@ function image_field_widget_settings_form($field, $instance) { '#title' => t('Preview image style'), '#type' => 'select', '#options' => image_style_options(FALSE), + '#empty_option' => '<' . t('no preview') . '>', '#default_value' => $settings['preview_image_style'], '#description' => t('The preview image will be shown while editing the content.'), '#weight' => 15, @@ -443,6 +444,7 @@ function image_field_formatter_settings_form($field, $instance, $view_mode, $for '#title' => t('Link image to'), '#type' => 'select', '#default_value' => $settings['image_link'], + '#empty_option' => t('Nothing'), '#options' => $link_types, ); diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 814579199..f20605589 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -2931,6 +2931,7 @@ function system_actions_manage_form($form, &$form_state, $options = array()) { '#title' => t('Action'), '#title_display' => 'invisible', '#options' => $options, + '#empty_option' => t('Choose an advanced action'), ); $form['parent']['actions'] = array('#type' => 'actions'); $form['parent']['actions']['submit'] = array( diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc index 6bccdbb08..639570adc 100644 --- a/modules/trigger/trigger.admin.inc +++ b/modules/trigger/trigger.admin.inc @@ -182,6 +182,7 @@ function trigger_assign_form($form, $form_state, $module, $hook, $label) { '#title' => t('List of trigger actions when !description', array('!description' => $label)), '#title_display' => 'invisible', '#options' => $options, + '#empty_option' => t('Choose an action'), ); $form[$hook]['parent']['submit'] = array( '#type' => 'submit', |