CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix in Form Generate load list generation

Browse Source 
For binary 1/0 blocks make sure we use the actual data and not just the
wrong binary 0/1 source
Also add auto translations for all strings in there
This commit is contained in:
Clemens Schwaighofer
2024-03-07 14:31:30 +09:00
parent e2fff45b16
commit abc2705c64
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
www/lib/CoreLibs/Output/Form/Generate.php
View File

@@ -826,27 +826,28 @@ class Generate
$pk_selected = $res[$this->int_pk_name]; $pk_selected = $res[$this->int_pk_name];
} }
$t_string = ''; $t_string = '';
foreach ($this->field_array as $i => $field_array) { foreach ($this->field_array as $field_array) {
if ($t_string) { if ($t_string) {
$t_string .= ', '; $t_string .= ', ';
} }
if (isset($field_array['before_value'])) { if (!empty($field_array['before_value'])) {
$t_string .= $field_array['before_value']; $t_string .= $this->l->__($field_array['before_value']);
} }
// must have res element set // must have res element set
if ( if (
isset($field_array['name']) && !empty($field_array['name']) &&
isset($res[$field_array['name']]) isset($res[$field_array['name']])
) { ) {
if (isset($field_array['binary'])) { $_t_value = '';
if (isset($field_array['binary'][0])) { // if we have a binary set, where 0 = YES and 1 = NO
$t_string .= $field_array['binary'][0]; if (!empty($field_array['binary'])) {
} elseif (isset($field_array['binary'][1])) { $_t_value = !empty($res[$field_array['name']]) ?
$t_string .= $field_array['binary'][1]; ($field_array['binary'][0] ?? 'Yes') :
} ($field_array['binary'][1] ?? 'No');
} else { } else {
$t_string .= $res[$field_array['name']]; $_t_value = $res[$field_array['name']];
} }
$t_string .= $this->l->__($_t_value);
} }
} }
$pk_names[] = $t_string; $pk_names[] = $t_string;