extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow to set (string) "true" as selectedValue for a checkbox, while default is (boolean) true and false for unselectedValue

Browse Source 
also fix validation in case an old eTemplate with attribute (un)selected_value is used
This commit is contained in:
ralf 2024-08-07 09:21:37 +02:00
parent 75063e500a
commit d7391b4dc6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/Et2Checkbox/Et2Checkbox.ts
View File

@ -61,9 +61,9 @@ export class Et2Checkbox extends Et2InputWidget(SlCheckbox)
}
@property({type: String})
selectedValue = 'true';
selectedValue = true;
@property({type: String})
unselectedValue = '';
unselectedValue = false;
constructor()
{

7
api/src/Etemplate/Widget/Checkbox.php
View File

@ -68,12 +68,13 @@ class Checkbox extends Etemplate\Widget
// defaults for set and unset values
$selected_value = true;
$unselected_value = false;
if(array_key_exists($value_attr, $this->attrs) || array_key_exists('unselectedValue', $this->attrs) || array_key_exists('unselected_value', $this->attrs))
if (array_key_exists($value_attr, $this->attrs) || array_key_exists('unselectedValue', $this->attrs) ||
array_key_exists('unselected_value', $this->attrs) || array_key_exists('selected_value', $this->attrs))
{
if(array_key_exists($value_attr, $this->attrs))
if (array_key_exists($value_attr, $this->attrs) || array_key_exists('selected_value', $this->attrs))
{
// Expand any content stuff
$selected_value = self::expand_name($this->attrs[$value_attr], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
$selected_value = self::expand_name($this->attrs[$value_attr] ?? $this->attrs['selected_value'], $expand['c'], $expand['row'], $expand['c_'], $expand['row_'], $expand['cont']);
}
if(array_key_exists('unselectedValue', $this->attrs) || array_key_exists('unselected_value', $this->attrs))
{