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

Merge branch 'master' into web-components

Browse Source
This commit is contained in:
nathan 2021-09-02 10:38:34 -06:00
commit b52000ceb7
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_mail.inc.php
View File

@ -1122,7 +1122,7 @@ class admin_mail
} }
if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']); if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
if (stripos($msg,'fatal error:')!==false) $msg_type = 'error'; if (stripos($msg,'fatal error:')!==false) $msg_type = 'error';
Framework::refresh_opener($msg, 'emailadmin', $content['acc_id'], $new_account ? 'add' : 'update', null, null, null, $msg_type); Framework::refresh_opener($msg, 'mail-account', $content['acc_id'], $new_account ? 'add' : 'update', null, null, null, $msg_type);
if ($button == 'save') Framework::window_close(); if ($button == 'save') Framework::window_close();
break; break;
@ -1135,7 +1135,7 @@ class admin_mail
elseif (Mail\Account::delete($content['acc_id']) > 0) elseif (Mail\Account::delete($content['acc_id']) > 0)
{ {
if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']); if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
Framework::refresh_opener(lang('Account deleted.'), 'emailadmin', $content['acc_id'], 'delete'); Framework::refresh_opener(lang('Account deleted.'), 'mail-account', $content['acc_id'], 'delete');
Framework::window_close(); Framework::window_close();
} }
else else

2
api/src/Contacts/Sql.php
View File

@ -1165,7 +1165,7 @@ class Sql extends Api\Storage
} }
elseif (!isset($keys['contact_id'])) elseif (!isset($keys['contact_id']))
{ {
$query = parent::delete($keys,true); $query = ['contact_id' => parent::delete($keys,true)];
} }
$this->db->delete(self::SHARED_TABLE, $query ?? $keys, __LINE__, __FILE__); $this->db->delete(self::SHARED_TABLE, $query ?? $keys, __LINE__, __FILE__);
} }

3
mail/inc/class.mail_hooks.inc.php
View File

@ -107,6 +107,9 @@ class mail_hooks
), ),
'entry' => 'Mail', 'entry' => 'Mail',
'entries' => 'Mails', 'entries' => 'Mails',
'additional' => [
'mail-account' => []
]
); );
} }

2
mail/js/app.js
View File

@ -595,7 +595,7 @@ app.classes.mail = AppJS.extend(
if (_type === 'delete' && !this.egw.dataHasUID('mail::'+_id)) return false; if (_type === 'delete' && !this.egw.dataHasUID('mail::'+_id)) return false;
break; break;
case 'emailadmin': // update tree with given mail account _id and _type case 'mail-account': // update tree with given mail account _id and _type
var tree = this.et2 ? this.et2.getWidgetById(this.nm_index+'[foldertree]') : null; var tree = this.et2 ? this.et2.getWidgetById(this.nm_index+'[foldertree]') : null;
if (!tree) break; if (!tree) break;
var node = tree.getNode(_id); var node = tree.getNode(_id);