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

Fix timesheet edit could not select start date

Browse Source 
Unimplemented "mode" legacy option was conflicting with flatpickr "mode" attribute
This commit is contained in:
nathan 2022-02-22 10:01:55 -07:00
parent 1c7e74a2af
commit ecd8b08373
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/etemplate.php
View File

@ -77,16 +77,16 @@ function send_template()
list($matches[1], $matches[2]) = explode('-', $type[1], 2); list($matches[1], $matches[2]) = explode('-', $type[1], 2);
} }
static $legacy_options = array( static $legacy_options = array(
'select' => 'empty_label', 'select' => 'empty_label',
'box' => ',cellpadding,cellspacing,keep', 'box' => ',cellpadding,cellspacing,keep',
'hbox' => 'cellpadding,cellspacing,keep', 'hbox' => 'cellpadding,cellspacing,keep',
'vbox' => 'cellpadding,cellspacing,keep', 'vbox' => 'cellpadding,cellspacing,keep',
'groupbox' => 'cellpadding,cellspacing,keep', 'groupbox' => 'cellpadding,cellspacing,keep',
'checkbox' => 'selected_value,unselected_value,ro_true,ro_false', 'checkbox' => 'selected_value,unselected_value,ro_true,ro_false',
'radio' => 'set_value,ro_true,ro_false', 'radio' => 'set_value,ro_true,ro_false',
'customfields' => 'sub-type,use-private,field-names', 'customfields' => 'sub-type,use-private,field-names',
'date' => 'data_format,mode', 'date' => 'data_format', // Legacy option "mode" was never implemented in et2
'description' => 'bold-italic,link,activate_links,label_for,link_target,link_popup_size,link_title', 'description' => 'bold-italic,link,activate_links,label_for,link_target,link_popup_size,link_title',
); );
// prefer more specific type-subtype over just type // prefer more specific type-subtype over just type
$names = $legacy_options[$matches[1].$matches[2]] ?? $legacy_options[$matches[1]] ?? null; $names = $legacy_options[$matches[1].$matches[2]] ?? $legacy_options[$matches[1]] ?? null;

2
timesheet/templates/default/edit.xet
View File

@ -102,7 +102,7 @@
</row> </row>
<row class="dialogHeader2"> <row class="dialogHeader2">
<description value="Date" for="ts_start"/> <description value="Date" for="ts_start"/>
<date id="ts_start" needed="1" options=",8" class="et2_fullWidth"/> <date id="ts_start" needed="1" class="et2_fullWidth"/>
<description/> <description/>
<description value="Starttime"/> <description value="Starttime"/>
<date-timeonly id="start_time" class="et2_fullWidth"/> <date-timeonly id="start_time" class="et2_fullWidth"/>