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

Calendar: Fix freetime search timeslot select

Browse Source
This commit is contained in:
nathan 2023-11-01 09:35:03 -06:00
parent 195e5a89bf
commit d0d9d6705f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -2859,7 +2859,7 @@ class calendar_uiforms extends calendar_ui
{ {
$e = $s + $duration; $e = $s + $duration;
$end_date = $e-$daybegin > DAY_s ? lang(date('l',$e)).' '.date($this->common_prefs['dateformat'],$e).' ' : ''; $end_date = $e-$daybegin > DAY_s ? lang(date('l',$e)).' '.date($this->common_prefs['dateformat'],$e).' ' : '';
$times[$s] = date($time_format,$s).' - '.$end_date.date($time_format,$e); $times[Api\DateTime::to($s, Api\DateTime::ET2)] = date($time_format, $s) . ' - ' . $end_date . date($time_format, $e);
} }
$sel_options[$n.'start'] = $times; $sel_options[$n.'start'] = $times;
} }

2
calendar/js/app.ts
View File

@ -1708,7 +1708,7 @@ export class CalendarApp extends EgwApp
// Make the Id from selected button by checking the index // Make the Id from selected button by checking the index
var selectedId = _widget.id.match(/^select\[([0-9])\]$/i)[1]; var selectedId = _widget.id.match(/^select\[([0-9])\]$/i)[1];
var sTime = <et2_date> this.et2.getWidgetById(selectedId+'start'); var sTime = <Et2Select><unknown>this.et2.getWidgetById(selectedId + 'start');
//check the parent window is still open before to try to access it //check the parent window is still open before to try to access it
if (window.opener && sTime) if (window.opener && sTime)