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

Admin: Fix some errors deleting a group

Browse Source 
- use the minified app.js
- export the JS class
- include the PHP command class explicitly so it's always found
- Make sure to send all expected parameters to ajax_delete_group
This commit is contained in:
nathan 2022-08-29 14:25:39 -06:00
parent aee54e5f45
commit d521d2aa24
3 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/js/app.ts
View File

@ -496,7 +496,7 @@ class AdminApp extends EgwApp
break; break;
case 'delete': case 'delete':
this.egw.json('admin_account::ajax_delete_group', [account_id, _action.data, this.et2._inst.etemplate_exec_id]).sendRequest(); this.egw.json('admin_account::ajax_delete_group', [account_id, _action.data, this.et2.getInstanceManager().etemplate_exec_id]).sendRequest();
break; break;
default: default:
if (!_action.data.url) if (!_action.data.url)
@ -1564,7 +1564,7 @@ class AdminApp extends EgwApp
{ {
if(button == Et2Dialog.YES_BUTTON) if(button == Et2Dialog.YES_BUTTON)
{ {
egw.json('admin_account::ajax_delete_group', [account_id]).sendRequest(false); // false = synchronious request egw.json('admin_account::ajax_delete_group', [account_id, [], _widget.getInstanceManager().etemplate_exec_id]).sendRequest(false); // false = synchronious request
window.close(); window.close();
} }
}, this.egw.lang('Delete this group') + '?'); }, this.egw.lang('Delete this group') + '?');

2
admin/src/Groups.php
View File

@ -10,6 +10,7 @@
namespace EGroupware\Admin; namespace EGroupware\Admin;
use admin_cmd_edit_group;
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Framework; use EGroupware\Api\Framework;
use EGroupware\Api\Egw; use EGroupware\Api\Egw;
@ -303,6 +304,7 @@ class Groups
$msg = $cmd->run(); $msg = $cmd->run();
return $cmd->account; return $cmd->account;
} }
/** /**
* Check entered data and return error-msg via json data or null * Check entered data and return error-msg via json data or null
* *

3
api/js/egw_action/egw_action.js
View File

@ -709,7 +709,8 @@ egwAction.prototype._check_confirm = function(_senders, _target)
{ {
if(this.data.policy_confirmation && egw.app('policy')) if(this.data.policy_confirmation && egw.app('policy'))
{ {
egw.includeJS(egw.link('/policy/js/app.js'), function() { egw.includeJS(egw.link('/policy/js/app.min.js'), function ()
{
if (typeof app.policy === 'undefined' || typeof app.policy.confirm === 'undefined') if (typeof app.policy === 'undefined' || typeof app.policy.confirm === 'undefined')
{ {
app.policy = new app.classes.policy(); app.policy = new app.classes.policy();