mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-23 14:28:45 +01:00
Add warnings, use warning instead of error on link problem
This commit is contained in:
parent
0054184aaf
commit
90328bf9cd
@ -86,6 +86,11 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
|
||||
*/
|
||||
private $user = null;
|
||||
|
||||
/**
|
||||
* List of import warnings
|
||||
*/
|
||||
protected $warnings = array();
|
||||
|
||||
/**
|
||||
* List of import errors
|
||||
*/
|
||||
@ -398,6 +403,18 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
|
||||
// lets do it!
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns warnings that were encountered during importing
|
||||
* Maximum of one warning message per record, but you can append if you need to
|
||||
*
|
||||
* @return Array (
|
||||
* record_# => warning message
|
||||
* )
|
||||
*/
|
||||
public function get_warnings() {
|
||||
return $this->warnings;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns errors that were encountered during importing
|
||||
* Maximum of one error message per record, but you can append if you need to
|
||||
@ -517,7 +534,7 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
|
||||
// Only one allowed
|
||||
if(count($result) != 1)
|
||||
{
|
||||
$this->errors[$record_num] .= lang('Unable to link to %3 by custom field "%1". %2 matches.',
|
||||
$this->warnings[$record_num] .= lang('Unable to link to %3 by custom field "%1". %2 matches.',
|
||||
$custom_field, count($result), lang($app));
|
||||
return false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user