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

Fix merge from list view

Browse Source
This commit is contained in:
Nathan Gray 2011-06-20 18:21:29 +00:00
parent 615ea171c2
commit 36a2be6dd3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,7 +398,7 @@ class calendar_merge extends bo_merge
$replacements = $this->contact_replacements(substr($participant,1),'');
break;
case 'r':
if (is_null(self::$resources)) self::$resources = CreateObject('resources.bo_resources');
if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
if (($resource = self::$resources->read(substr($participant,1))))
{
foreach($resource as $name => $value)

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

@ -97,6 +97,13 @@ class calendar_uilist extends calendar_ui
$etpl = new etemplate('calendar.list');
// Handle merge from sidebox
if($_GET['merge'])
{
$content['nm']['action'] = 'document_'.$_GET['merge'];
$content['nm']['select_all'] = true;
}
if (is_array($content))
{
// handle a single button like actions
@ -704,6 +711,9 @@ class calendar_uilist extends calendar_ui
$checked['start'] = $nm['startdate'];
$checked['end'] = $nm['enddate'];
break;
default:
$date = date_create_from_format('Ymd',$this->date);
$checked['start']= $date->format('U');
}
}
return $checked;
@ -789,12 +799,10 @@ class calendar_uilist extends calendar_ui
'hint' => 'Download this event as iCal',
'disableClass' => 'rowNoView',
);
/* not working, needs fixing
$actions['documents'] = addressbook_merge::document_action(
$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
$this->bo->cal_prefs['default_document']
);
*/
++$group;
$actions['delete'] = array(
'caption' => 'Delete',