diff --git a/classes/controllers/FrmEntriesController.php b/classes/controllers/FrmEntriesController.php index 9a597e8e4f..e37cc1ee95 100644 --- a/classes/controllers/FrmEntriesController.php +++ b/classes/controllers/FrmEntriesController.php @@ -235,13 +235,35 @@ private static function add_field_cols( $field, $form_id, &$columns ) { $col_id .= '-_-form' . $field->form_id; } - $has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' ); - $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status'; - if ( $has_separate_value && ! $is_post_status ) { - $columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 ); + $has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' ); + $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status'; + $include_column_for_sep_val = $has_separate_value && ! $is_post_status; + if ( $include_column_for_sep_val ) { + $columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val ); } - $columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 ); + $columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false ); + } + + /** + * Appends "(Value)" or "(Label)" to the field name if it's an option field that has a separate value/label. + * + * @since x.x + * + * @param object $field + * @param bool $include_column_for_sep_val + * @param bool $is_value + * + * @return string + */ + private static function maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, $is_value = true ) { + $field_name = FrmAppHelper::truncate( $field->name, 35 ); + if ( ! $include_column_for_sep_val || ! in_array( $field->type, array( 'select', 'radio', 'checkbox' ), true ) ) { + return $field_name; + } + $append_text = $is_value ? esc_html__( 'Value', 'formidable' ) : esc_html__( 'Label', 'formidable' ); + + return sprintf( '%s (%s)', $field_name, $append_text ); } private static function maybe_add_ip_col( $form_id, &$columns ) {