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

Add status icons in event tooltips

Browse Source
This commit is contained in:
Nathan Gray 2015-10-27 20:10:53 +00:00
parent 3dfd74768e
commit ad6cfe4871
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -826,7 +826,7 @@ class calendar_ui
{ {
$event['app_id'] .= ':'.$event['recur_date']; $event['app_id'] .= ':'.$event['recur_date'];
} }
$event['parts'] = implode(",\n",$this->bo->participants($event,true)); $event['parts'] = implode(",\n",$this->bo->participants($event,false));
$event['date'] = $this->bo->date2string($event['start']); $event['date'] = $this->bo->date2string($event['start']);
// Change dates // Change dates

4
calendar/inc/class.calendar_uilist.inc.php
View File

@ -397,7 +397,6 @@ class calendar_uilist extends calendar_ui
} }
foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event) foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
{ {
$this->to_client($event);
if ($params['csv_export']) if ($params['csv_export'])
{ {
@ -405,8 +404,7 @@ class calendar_uilist extends calendar_ui
} }
else else
{ {
$event['parts'] = implode(",\n",$this->bo->participants($event,true)); $this->to_client($event);
$event['date'] = $this->bo->date2string($event['start']);
} }

1
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -2978,6 +2978,7 @@ class calendar_uiviews extends calendar_ui
$dayEvents[$day][$num]['whole_day']=true; $dayEvents[$day][$num]['whole_day']=true;
} }
} }
$this->to_client($dayEvents[$day][$num]);
} }
// check after every day if we have to increase $this->extraRows // check after every day if we have to increase $this->extraRows
if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows) if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)