mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
CHnages for day view. Looks like devel code has had this for a while, which would display improper records for users other than yourself.
This commit is contained in:
parent
3a826ab4a6
commit
f38505501e
@ -1130,7 +1130,7 @@ class calendar extends calendar_
|
|||||||
$time[$ind] .= '<font color="CC0000">';
|
$time[$ind] .= '<font color="CC0000">';
|
||||||
}
|
}
|
||||||
|
|
||||||
$time[$ind] .= $this->is_private($event,$this->owner,'name').(isset($phpgw_info['user']['preferences']['calendar']['display_status']) && $phpgw_info['user']['preferences']['calendar']['display_status'] == True?' ('.$event->users_status.')':'');
|
$time[$ind] .= $this->is_private($event,$this->owner,'title').(isset($phpgw_info['user']['preferences']['calendar']['display_status']) && $phpgw_info['user']['preferences']['calendar']['display_status'] == True?' ('.$event->users_status.')':'');
|
||||||
|
|
||||||
if ($event->priority == 3)
|
if ($event->priority == 3)
|
||||||
{
|
{
|
||||||
@ -1174,7 +1174,7 @@ class calendar extends calendar_
|
|||||||
|
|
||||||
$time = Array();
|
$time = Array();
|
||||||
|
|
||||||
$events = $this->get_sorted_by_date($date['raw']);
|
$events = $this->get_sorted_by_date($date['raw'],$this->owner);
|
||||||
|
|
||||||
if(!$events)
|
if(!$events)
|
||||||
{
|
{
|
||||||
@ -1184,11 +1184,7 @@ class calendar extends calendar_
|
|||||||
$event = CreateObject('calendar.calendar_item');
|
$event = CreateObject('calendar.calendar_item');
|
||||||
for($i=0;$i<count($events);$i++)
|
for($i=0;$i<count($events);$i++)
|
||||||
{
|
{
|
||||||
$event = $events[$i];
|
$this->html_for_event_day_at_a_glance($events[$i],$first_hour,$last_hour,$time);
|
||||||
if($event)
|
|
||||||
{
|
|
||||||
$this->html_for_event_day_at_a_glance($event,$first_hour,$last_hour,$time);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user