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

Admin - remove a few more fields we don't want in periodic child jobs

Browse Source
This commit is contained in:
nathangray 2019-06-12 14:00:28 -06:00
parent cd694a16a7
commit c259893926
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
admin/inc/class.admin_cmd.inc.php
View File

@ -1126,12 +1126,12 @@ abstract class admin_cmd
// instanciate single periodic execution object
$single = $cmd->as_array();
$single['parent'] = $single['id'];
$single = array_diff_key($single, array(
$single = array_diff_key($single, array_flip(array(
'id','uid',
'created','modified','modifier',
'async_job_id','rrule','scheduled',
'status', 'set', 'old'
));
'status', 'set', 'old','value','result'
)));
$periodic = admin_cmd::instanciate($single);
@ -1418,6 +1418,19 @@ abstract class admin_cmd
// ignore widgets that can't go in the historylog
case 'button': case 'buttononly': case 'taglist-thumbnail':
break;
case 'radio':
if (!is_array($widgets[$widget->id])) $widgets[$widget->id] = [];
$label = (string)$widget->attrs['label'];
// translate "{something} {else}" type options
if (strpos($label, '{') !== false)
{
$label = preg_replace_callback('/{([^}]+)}/', function($matches)
{
return lang($matches[1]);
}, $label);
}
$widgets[$widget->id][(string)$widget->attrs['set_value']] = $label;
break;
// config templates have options in the template
case 'option':
if (!is_array($widgets[$last_select])) $widgets[$last_select] = [];