extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ImportExport: allow to select "Old fixed definition" in preference for nextmatch export (disk icon)

Browse Source
This commit is contained in:
Ralf Becker 2011-11-21 10:10:46 +00:00
parent 77647a9d31
commit 176e81cd1c
8 changed files with 19 additions and 8 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('Old fixed 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('Old fixed 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))
{

3
importexport/lang/egw_de.lang
View File

@ -37,7 +37,7 @@ field labels importexport de Feld Beschreibung
field names importexport de Feld Name
fieldseperator importexport de Feldtrenner
finish importexport de Fertig
general importexport de Generell
general preferences de Generell
header lines to skip importexport de Kopfzeilen zu überspringen
human friendly values importexport de Verwendet die Beschreibungen, anstatt der Internen Bezeichnungen
if you specify an export definition, it will be used when you export preferences de Wenn Sie Export Definition erfassen , wird dieses Profil für den Export verwendet.
@ -56,6 +56,7 @@ manage mapping importexport de Zuordnung bearbeiten
next importexport de Weiter
next run importexport de Nächster Import
no records selected importexport de Keine Datensätze ausgewählt
old fixed definition preferences de Alte feste Definition
please select file to import importexport de Bitte wählen Sie ein Import Datei
plugin importexport de Plug-In
preview importexport de Vorschau

2
importexport/lang/egw_en.lang
View File

@ -66,6 +66,7 @@ manage mapping importexport en Manage mapping
next importexport en Next
next run importexport en Next run
no records selected importexport en No records selected!
old fixed definition preferences en Old fixed definition
please select file to import importexport en Please select file to import
plugin importexport en Plugin
preview importexport en Preview
@ -98,4 +99,3 @@ users allowed to share their own definitions importexport en Users allowed to sh
which useres are allowed for this definition importexport en Which users are allowed to use this definition
which users are allowed to use this definition importexport en Which users are allowed to use this definition
you need to select an app and format first! importexport en You need to select an app and format first!
1 importexport en 1

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('Old fixed 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('Old fixed 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('Old fixed definition')
);
foreach ((array)$definitions->get_definitions() as $identifier)
{
try