extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-20 12:58:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change delete group handler to accept documentation data

Browse Source
This commit is contained in:
nathangray 2019-05-28 09:59:55 -06:00
parent 5f58e4a23c
commit ffa1102687
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,10 +293,11 @@ class admin_account
* Delete a group via ajax * Delete a group via ajax
* *
* @param int $account_id * @param int $account_id
* @param String[] $data Optional data
*/ */
public static function ajax_delete_group($account_id) public static function ajax_delete_group($account_id, $data)
{ {
$cmd = new admin_cmd_delete_account(Api\Accounts::id2name(Api\Accounts::id2name($account_id)), null, false); $cmd = new admin_cmd_delete_account(Api\Accounts::id2name(Api\Accounts::id2name($account_id)), null, false, $data['admin_cmd']);
$msg = $cmd->run(); $msg = $cmd->run();
Api\Json\Response::get()->call('egw.refresh', $msg, 'admin', $account_id, 'delete'); Api\Json\Response::get()->call('egw.refresh', $msg, 'admin', $account_id, 'delete');

6
admin/js/app.js
View File

@ -443,12 +443,8 @@ app.classes.admin = AppJS.extend(
break; break;
case 'delete': case 'delete':
if (!this.egw.app('policy')) this.egw.json('admin_account::ajax_delete_group', [account_id, _action.data]).sendRequest();
{
this.egw.json('admin_account::ajax_delete_group', [account_id]).sendRequest();
break; break;
}
// fall through to open popup for policy
default: default:
if (!_action.data.url) if (!_action.data.url)
{ {