extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing template error breaking vCard export

Browse Source
This commit is contained in:
Nathan Gray 2014-05-13 21:10:07 +00:00
parent bca1696866
commit 71790459b2
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addressbook/inc/class.addressbook_export_vcard.inc.php
View File

@ -40,7 +40,7 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
$old_app = $GLOBALS['egw_info']['flags']['currentapp']; $old_app = $GLOBALS['egw_info']['flags']['currentapp'];
$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook'; $GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
if ($options['selection'] == 'use_all' || $options['selection'] == 'all') { if ($options['selection'] == 'search') {
// uicontacts selection with checkbox 'use_all' // uicontacts selection with checkbox 'use_all'
$query = $GLOBALS['egw']->session->appsession('index','addressbook'); $query = $GLOBALS['egw']->session->appsession('index','addressbook');
$query['num_rows'] = -1; // all $query['num_rows'] = -1; // all
@ -48,7 +48,7 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id']; if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
$this->uicontacts->get_rows($query,$this->selection,$readonlys, true); // only return the ids $this->uicontacts->get_rows($query,$this->selection,$readonlys, true); // only return the ids
} }
elseif ( $options['selection'] == 'all_contacts' ) { elseif ( $options['selection'] == 'all' ) {
if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) { if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
$col_filter['account_id'] = null; $col_filter['account_id'] = null;
} }
@ -136,8 +136,8 @@ class addressbook_export_vcard implements importexport_iface_export_plugin {
*/ */
public function get_selectors_etpl() { public function get_selectors_etpl() {
return array( return array(
'name' => 'addressbook.export_csv_selectors', 'name' => 'addressbook.export_vcard_selectors',
'content' => 'use_all', 'content' => 'all',
); );
} }
} }

19
addressbook/templates/default/export_vcard_selectors.xet Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
<template id="addressbook.export_vcard_selectors" template="" lang="" group="0" version="1.9.001">
<grid>
<columns>
<column/>
</columns>
<rows>
<row>
<radio label="Use all" id="selection" options="all"/>
</row>
<row>
<radio label="Use search results" id="selection" options="search"/>
</row>
</rows>
</grid>
</template>
</overlay>