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

Don't overwrite numeric owner IDs from successful conversion

Browse Source
This commit is contained in:
Nathan Gray 2011-04-04 21:24:06 +00:00
parent 7962433e27
commit a8e8d82f64
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
timesheet/inc/class.timesheet_import_csv.inc.php
View File

@ -219,19 +219,21 @@ class timesheet_import_csv implements importexport_iface_import_plugin {
} }
// Set creator, unless it's supposed to come from CSV file // Set creator, unless it's supposed to come from CSV file
if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner'] && !is_numeric($record['ts_owner'])) { if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
// Automatically handle text owner without explicit translation if(!is_numeric($record['ts_owner'])) {
$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']); // Automatically handle text owner without explicit translation
if($new_owner == '') { $new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
$this->errors[$import_csv->get_current_position()] = lang( if($new_owner == '') {
'Unable to convert "%1" to account ID. Using plugin setting (%2) for %3.', $this->errors[$import_csv->get_current_position()] = lang(
$record['ts_owner'], 'Unable to convert "%1" to account ID. Using plugin setting (%2) for %3.',
common::grab_owner_name($_definition->plugin_options['creator']), $record['ts_owner'],
lang($this->bo->field2label['ts_owner']) common::grab_owner_name($_definition->plugin_options['creator']),
); lang($this->bo->field2label['ts_owner'])
$record['ts_owner'] = $_definition->plugin_options['creator']; );
} else { $record['ts_owner'] = $_definition->plugin_options['creator'];
$record['ts_owner'] = $new_owner; } else {
$record['ts_owner'] = $new_owner;
}
} }
} elseif ($_definition->plugin_options['creator']) { } elseif ($_definition->plugin_options['creator']) {
$record['ts_owner'] = $_definition->plugin_options['creator']; $record['ts_owner'] = $_definition->plugin_options['creator'];