extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate - also submit action data

Browse Source
This commit is contained in:
nathangray 2019-05-14 16:43:15 -06:00
parent 1497f6f026
commit edfd5fd24d
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/inc/class.admin_customfields.inc.php
View File

@ -184,7 +184,12 @@ class admin_customfields
{
if(in_array($data['id'],$content['nm']['selected']))
{
$cmd = new admin_cmd_customfield($this->appname, array('id' => $data['id'],'name' => $name));
$cmd = new admin_cmd_customfield(
$this->appname,
array('id' => $data['id'],'name' => $name),
null,
$content['nm']['admin_cmd']
);
$cmd->run();
unset($this->fields[$name]);
}
@ -520,6 +525,7 @@ class admin_customfields
'caption' => 'Delete',
'confirm' => 'Delete this entry',
'confirm_multiple' => 'Delete these entries',
'policy_confirmation' => 'Oh yeah',
'group' => ++$group,
'disableClass' => 'rowNoDelete',
),

11
api/js/egw_action/egw_action.js
View File

@ -683,6 +683,17 @@ egwAction.prototype._check_confirm = function(_senders, _target)
var self = this;
if(msg.trim().length > 0)
{
if(this.data.policy_confirmation && egw.app('policy'))
{
egw.includeJS(egw.link('/policy/js/app.js'), function() {
if(typeof app.policy === 'undefined' || typeof app.policy.confirm === 'undefined')
{
app.policy = new app.classes.policy();
}
app.policy.confirm(self, _senders, _target);
});
return;
}
et2_dialog.show_dialog(function(_button)
{
if (_button == et2_dialog.YES_BUTTON)

5
api/js/etemplate/et2_extension_nextmatch_actions.js
View File

@ -231,13 +231,16 @@ function nm_action(_action, _senders, _target, _ids)
// Fake a getValue() function
var old_value = nextmatch.getValue;
var value = nextmatch.getValue();
jQuery.extend(value, this.activeFilters, {
jQuery.extend(value, _action.data, this.activeFilters, {
"selected": idsArr,
"select_all": _ids.all,
"checkboxes": checkbox_values
});
value[nextmatch.options.settings.action_var]= _action.id;
// Don't try to send the nextmatch
delete value['nextmatch'];
nextmatch.getValue = function() {
return value;
};