forked from extern/egroupware
"fixed calendar csv-export:
- was only exporting 15 events (num_rows not forwarded to bo) - participants contained html for status icon"
This commit is contained in:
parent
ec5d0cb0c5
commit
7d89d8866d
@ -228,6 +228,7 @@ class calendar_uilist extends calendar_ui
|
|||||||
'filter' => $this->filter,
|
'filter' => $this->filter,
|
||||||
'query' => $params['search'],
|
'query' => $params['search'],
|
||||||
'offset' => (int) $params['start'],
|
'offset' => (int) $params['start'],
|
||||||
|
'num_rows'=> $params['num_rows'],
|
||||||
'order' => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
|
'order' => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
|
||||||
'cfs' => $cfs,
|
'cfs' => $cfs,
|
||||||
);
|
);
|
||||||
@ -299,7 +300,7 @@ class calendar_uilist extends calendar_ui
|
|||||||
$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
|
$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
|
||||||
$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event);
|
$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event);
|
||||||
|
|
||||||
$event['parts'] = implode(",\n",$this->bo->participants($event));
|
$event['parts'] = implode(",\n",$this->bo->participants($event,true));
|
||||||
$event['recure'] = $this->bo->recure2string($event);
|
$event['recure'] = $this->bo->recure2string($event);
|
||||||
$event['date'] = $this->bo->date2string($event['start']);
|
$event['date'] = $this->bo->date2string($event['start']);
|
||||||
if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
|
if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
|
||||||
|
Loading…
Reference in New Issue
Block a user