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

missing templates and a fix for new reply handling

Browse Source
This commit is contained in:
Ralf Becker 2013-02-01 16:54:51 +00:00
parent 380b57a85d
commit e47fca7d10
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1713,11 +1713,11 @@ function replace_eTemplate_onsubmit()
isset($existing_event['participants'][$event['ical_sender_uid']]) &&
$this->bo->check_status_perms($event['ical_sender_uid'], $existing_event))
{
$status = $event['participants'][$event['ical_sender_uid']];
calendar_so::split_status($status, $quantity, $role);
$event['ical_sender_status'] = $event['participants'][$event['ical_sender_uid']];
calendar_so::split_status($event['ical_sender_status'], $quantity, $role);
$existing_status = $existing_event['participants'][$event['ical_sender_uid']];
calendar_so::split_status($existing_status, $quantity, $role);
if ($existing_status != $status)
if ($existing_status != $event['ical_sender_status'])
{
$readonlys['button[apply]'] = false;
}
@ -1822,9 +1822,7 @@ function replace_eTemplate_onsubmit()
case 'apply':
// set status and send notification / meeting response
$status = $event['participants'][$event['ical_sender_status']];
calendar_so::split_status($status, $quantity, $role);
if ($this->bo->set_status($event['id'], $event['ical_sender_uid'], $status))
if ($this->bo->set_status($event['id'], $event['ical_sender_uid'], $event['ical_sender_status']))
{
$msg = lang('Status changed');
}

4
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

7
calendar/templates/default/meeting.xet
View File

@ -19,6 +19,13 @@
<button label="Reject" id="button[reject]" class="leftPad5"/>
<buttononly statustext="Edit event in calendar" label="Edit" id="button[edit]" onclick="window.open(egw::link('/index.php','menuaction=calendar.calendar_uiforms.edit&amp;cal_id=$cont[id]'),'_blank','dependent=yes,width=750,height=410,scrollbars=yes,status=yes'); return false;" class="leftPad5"/>
</row>
<row disabled="!@ics_method=reply">
<description value="This mail contains a reply to a meeting request" class="meetingRequestMessage"/>
<button label="Apply" id="button[apply]" class="leftPad5"/>
<description/>
<description/>
<description/>
</row>
</rows>
</grid>
<description/>

4
phpgwapi/inc/class.groupdav_principals.inc.php
View File

@ -1019,10 +1019,12 @@ class groupdav_principals extends groupdav_handler
{
// found an addressbook entry
$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
$type = 'users';
}
else // just store email-address
{
$uid = 'e'.$rest;
$type = 'users';
}
break;
@ -1048,7 +1050,7 @@ class groupdav_principals extends groupdav_handler
if (is_null($calendar_bo)) $calendar_bo = new calendar_bo();
foreach($calendar_bo->resources as $letter => $info)
{
if ($info['app'] == $type)
if ($info['app'] == $type || $info['app'] == 'resources' && $type == 'location')
{
$uid = $letter.$id;
}