harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calendar merge: d&d support and some minor cleanup and fixes

Browse Source
This commit is contained in:
Mario Vavti
2019-04-29 11:45:55 +02:00
parent 0cecfceb14
commit dce6a5763d
3 changed files with 91 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Zotlabs/Module/Channel_calendar.php
View File

@@ -524,6 +524,14 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
}
$allDay = false;
// allDay event rules
if(!strpos($start, 'T') && !strpos($end, 'T'))
$allDay = true;
if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00'))
$allDay = true;
$is_first = ($d !== $last_date);
$last_date = $d;
@@ -550,12 +558,13 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'start'=> $start,
'end' => $end,
'drop' => $drop,
'allDay' => false,
'allDay' => $allDay,
'title' => $title,
'j' => $j,
'd' => $d,
'is_editable' => $edit ? true : false,
'editable' => $edit ? true : false,
'is_first'=>$is_first,
'item'=>$rr,