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

Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available

Browse Source
This commit is contained in:
Nathan Gray 2011-11-18 16:01:57 +00:00
parent 38f282bccf
commit 1afba81ce8
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -284,7 +284,9 @@ class addressbook_hooks
'type' => 'export',
'application' => 'addressbook'
));
$options = array();
$options = array(
'~nextmatch~' => lang('No definition')
);
$default_def = 'export-addressbook';
foreach ((array)$definitions->get_definitions() as $identifier)
{

4
calendar/inc/class.calendar_hooks.inc.php
View File

@ -622,7 +622,9 @@ class calendar_hooks
'type' => 'export',
'application' => 'calendar'
));
$options = array();
$options = array(
'~nextmatch~' => lang('No definition')
);
foreach ((array)$definitions->get_definitions() as $identifier)
{
try

2
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -497,7 +497,7 @@ class nextmatch_widget
$name = is_object($extension_data['template']) ? $extension_data['template']->name : $extension_data['template'];
list($app) = explode('.',$name);
$definition = $GLOBALS['egw_info']['user']['preferences'][$app]['nextmatch-export-definition'];
if(!$value['no_csv_export'] && ($definition || !is_array($value['csv_fields'])))
if(!$value['no_csv_export'] && $definition != '~nextmatch~' && ($definition || !is_array($value['csv_fields'])))
{
if($GLOBALS['egw_info']['user']['apps']['importexport'] && ($definition || $value['csv_fields']) && is_object($nextmatch))
{

4
infolog/inc/class.infolog_hooks.inc.php
View File

@ -410,7 +410,9 @@ class infolog_hooks
'type' => 'export',
'application' => 'infolog'
));
$options = array();
$options = array(
'~nextmatch~' => lang('No definition')
);
foreach ((array)$definitions->get_definitions() as $identifier)
{
try

4
resources/inc/class.resources_hooks.inc.php
View File

@ -189,7 +189,9 @@ class resources_hooks
'type' => 'export',
'application' => 'resources'
));
$options = array();
$options = array(
'~nextmatch~' => lang('No definition')
);
$default_def = 'export-resources';
foreach ((array)$definitions->get_definitions() as $identifier)
{

4
timesheet/inc/class.timesheet_hooks.inc.php
View File

@ -203,7 +203,9 @@ class timesheet_hooks
'type' => 'export',
'application' => 'timesheet'
));
$options = array();
$options = array(
'~nextmatch~' => lang('No definition')
);
foreach ((array)$definitions->get_definitions() as $identifier)
{
try