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

fixed contact modified by other use warning, if changing account relevant details in a contact (eg. email-address)

Browse Source
This commit is contained in:
Ralf Becker 2014-06-05 08:42:45 +00:00
parent 2b0691306c
commit 8e5adb50f7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/inc/class.admin_account.inc.php
View File

@ -166,18 +166,22 @@ class admin_account
egw_json_response::get()->call('egw.refresh', '', 'admin', $cmd->account, $content['account_id'] ? 'edit' : 'add'); egw_json_response::get()->call('egw.refresh', '', 'admin', $cmd->account, $content['account_id'] ? 'edit' : 'add');
// for a new account a new contact was created, need to merge that data with $content
if (!$content['account_id'])
{
$content['account_id'] = $cmd->account;
$addressbook_bo = new addressbook_bo(); $addressbook_bo = new addressbook_bo();
if (!($content['id'] = accounts::id2name($cmd->account, 'person_id')) || if (!($content['id'] = accounts::id2name($cmd->account, 'person_id')) ||
!($contact = $addressbook_bo->read($content['id']))) !($contact = $addressbook_bo->read($content['id'])))
{ {
throw new egw_exception_assertion_failed("Can't find contact of just created account!"); throw new egw_exception_assertion_failed("Can't find contact of just created account!");
} }
// for a new account a new contact was created, need to merge that data with $content
if (!$content['account_id'])
{
$content['account_id'] = $cmd->account;
$content = array_merge($contact, $content); $content = array_merge($contact, $content);
} }
else // for updated account, we need to refresh etag
{
$content['etag'] = $contact['etag'];
}
} }
/** /**