extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Give proper error messages for modification error as well as permissions error

Browse Source
This commit is contained in:
Nathan Gray 2012-03-19 18:45:14 +00:00
parent 102c0e569c
commit 5f1c65b31e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -327,12 +327,22 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
break; break;
} else { } else {
$result = $this->boinfolog->write( $_data, true, 2); // 2 = dont touch modification date $result = $this->boinfolog->write( $_data, true, 2); // 2 = dont touch modification date
if(!$result) { if(!$result)
$this->errors[$record_num] = lang('Permissions error - %1 could not %2', {
$GLOBALS['egw']->accounts->id2name($_data['info_owner']), if($result === false)
lang($_action) {
); $this->errors[$record_num] = lang('Permissions error - %1 could not %2',
} else { $GLOBALS['egw']->accounts->id2name($_data['info_owner']),
lang($_action)
);
}
else
{
$this->errors[$record_num] = lang('Error: the entry has been updated since you opened it for editing!');
}
}
else
{
$this->results[$_action]++; $this->results[$_action]++;
} }
break; break;