test and improve customfield import handling
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 26 Aug 2016 13:34:14 +0000 (15:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 31 Aug 2016 16:22:41 +0000 (18:22 +0200)
commit689125e4362af9a4ddb1e5031259f77858b8d5cc
treefc514d97da7cc6b2462922bd7fd2276865ceac87
parent429bb4148514ea8a385254606fa324aacca662b1
test and improve customfield import handling

* adds a test with customfield merge for duplicates
* adds cf sorting by key

Change-Id: Ib229335785de5ead2f07d39e495e8b28e778bc0c
Reviewed-on: http://gerrit.tine20.com/customers/3486
Tested-by: Jenkins CI (http://ci.tine20.com/)
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
tests/tine20/Addressbook/Import/CsvTest.php
tests/tine20/Addressbook/Import/files/adb_import_csv_duplicate.xml
tests/tine20/Addressbook/Import/files/import_duplicate_1_cf.csv [new file with mode: 0644]
tests/tine20/Addressbook/Import/files/import_duplicate_2_cf.csv [new file with mode: 0644]
tine20/Tinebase/CustomField.php
tine20/Tinebase/Model/Filter/CustomField.php