Skip to content

Add a text that clarifies whether a field column is for field value or label #2326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add a text that clarifies whether a field column is for field value or label #2326

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b82876
Add a text that clarifies whether a field column is for field value o…
AbdiTolesa Apr 25, 2025
2bd98cb
Avoid extra label if the value/label are not separate
AbdiTolesa Apr 25, 2025
1d46cc9
Fix typo
AbdiTolesa Apr 28, 2025
e16af91
Use clearer variable name
AbdiTolesa Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions classes/controllers/FrmEntriesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down