holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug: no conflict with events with group-invitations

Browse Source
This commit is contained in:
Ralf Becker 2006-03-16 18:03:43 +00:00
parent a3951c16bc
commit 6ca6cdcfa9
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.bocal.inc.php
View File

@ -98,6 +98,7 @@ class bocal
'R' => 'Rejected',
'T' => 'Tentative',
'U' => 'No Response',
'G' => 'Group invitation',
);
/**
* @var array recur_types translates MCAL recur-types to verbose labels
@ -1307,15 +1308,16 @@ class bocal
*
* @param array $event event-data
* @param boolean $long_status=false should the long/verbose status or only the one letter shortcut be used
* @param boolean $show_group_invitation=false show group-invitations (status == 'G') or not (default)
* @return array with id / names with status pairs
*/
function participants($event,$long_status=False)
function participants($event,$long_status=False,$show_group_invitation=false)
{
//_debug_array($event);
$names = array();
foreach($event['participants'] as $id => $status)
{
if ($status == 'G') continue; // dont show group-invitation
if ($status == 'G' && !$show_group_invitation) continue; // dont show group-invitation
$status = $this->verbose_status[$status];

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

@ -145,6 +145,7 @@ class bocalupdate extends bocal
'end' => $event['end'],
'users' => $users,
'ignore_acl' => true, // otherwise we get only events readable by the user
'enum_groups' => true, // otherwise group-events would not block time
));
if ($this->debug > 2 || $this->debug == 'update')
{

3
calendar/inc/class.uiforms.inc.php
View File

@ -767,7 +767,7 @@ class uiforms extends uical
'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
'conflicting_participants' => implode(",\n",$this->bo->participants(array(
'participants' => array_intersect_key($conflict['participants'],$event['participants']),
))),
),true,true)), // show group invitations too
'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
);
@ -971,6 +971,7 @@ class uiforms extends uical
'start' => $start,
'end' => $end,
'users' => $participants,
'ignore_acl' => true, // otherwise we get only events readable by the user
));
$busy[] = array( // add end-of-search-date as event, to cope with empty search and get freetime til that date
'start' => $end,

1
calendar/setup/phpgw_de.lang
View File

@ -124,6 +124,7 @@ fullname of person to notify calendar de Name der zu benachrichtigenden Person
general calendar de Allgemein
global public and group public calendar de Global öffentlich und Gruppen-öffentlich
global public only calendar de nur Global öffentlich
group invitation calendar de Gruppeneinladung
group planner calendar de Gruppenplaner
group public only calendar de Gruppen-Öffentlich
groupmember(s) %1 not included, because you have no access. calendar de Gruppenmitglied(er) %1 nicht enthalten, da Sie keinen Zugriff haben.

1
calendar/setup/phpgw_en.lang
View File

@ -124,6 +124,7 @@ fullname of person to notify calendar en Fullname of person to notify
general calendar en General
global public and group public calendar en global public and group public
global public only calendar en global public only
group invitation calendar en Group invitation
group planner calendar en Group planner
group public only calendar en group public only
groupmember(s) %1 not included, because you have no access. calendar en Groupmember(s) %1 not included, because you have no access.