extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix birthday import, rename job title column in default definition

Browse Source
This commit is contained in:
Nathan Gray 2012-10-23 15:15:54 +00:00
parent 3ff97fb7e6
commit eb40104d5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_import_contacts_csv.inc.php
View File

@ -144,7 +144,7 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private); if(array_key_exists('private', $record_array) && (!isset($record_array['private']) || $record_array['private'] == '')) unset($record->private);
// Format birthday as backend requires - converter should give timestamp // Format birthday as backend requires - converter should give timestamp
if(isset($record->bday) && is_numeric($record->bday)) if($record->bday && is_numeric($record->bday))
{ {
$time = new egw_time($record->bday); $time = new egw_time($record->bday);
$record->bday = $time->format('Y-m-d'); $record->bday = $time->format('Y-m-d');

2
addressbook/setup/importexport_default.xml
View File

@ -217,7 +217,7 @@
<entry type="string" name="bday">Birthday</entry> <entry type="string" name="bday">Birthday</entry>
<entry type="string" name="org_name">Company</entry> <entry type="string" name="org_name">Company</entry>
<entry type="string" name="org_unit">Department</entry> <entry type="string" name="org_unit">Department</entry>
<entry type="string" name="title">title</entry> <entry type="string" name="title">Job Title</entry>
<entry type="string" name="role">Role</entry> <entry type="string" name="role">Role</entry>
<entry type="string" name="assistent">Assistent</entry> <entry type="string" name="assistent">Assistent</entry>
<entry type="string" name="room">Room</entry> <entry type="string" name="room">Room</entry>