tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11329-widget-de-latest-events-no-recoge-grupos-secundarios' into 'develop'

Browse Source 
Ent 11329 Widget de latest events no recoge grupos secundarios

See merge request artica/pandorafms!6818
This commit is contained in:
Matias Didier 2024-01-18 10:16:23 +00:00
commit de406f3224
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/lib/Dashboard/Widgets/events_list.php
View File

@ -246,6 +246,10 @@ class EventsListWidget extends Widget
$values['groupRecursion'] = $decoder['groupRecursion']; $values['groupRecursion'] = $decoder['groupRecursion'];
} }
if (isset($decoder['secondaryGroup']) === true) {
$values['secondaryGroup'] = $decoder['secondaryGroup'];
}
if (isset($decoder['customFilter']) === true) { if (isset($decoder['customFilter']) === true) {
$values['customFilter'] = $decoder['customFilter']; $values['customFilter'] = $decoder['customFilter'];
} }
@ -456,6 +460,18 @@ class EventsListWidget extends Widget
], ],
]; ];
// Secondary group.
$inputs['inputs']['row2'][] = [
'label' => \__('Secondary group'),
'arguments' => [
'type' => 'switch',
'name' => 'secondaryGroup',
'class' => 'event-widget-input',
'value' => $values['secondaryGroup'],
'return' => true,
],
];
// Group recursion. // Group recursion.
$inputs['inputs']['row2'][] = [ $inputs['inputs']['row2'][] = [
'label' => \__('Group recursion'), 'label' => \__('Group recursion'),
@ -537,6 +553,7 @@ class EventsListWidget extends Widget
$values['groupId'] = \get_parameter_switch('groupId', []); $values['groupId'] = \get_parameter_switch('groupId', []);
$values['tagsId'] = \get_parameter_switch('tagsId', []); $values['tagsId'] = \get_parameter_switch('tagsId', []);
$values['groupRecursion'] = \get_parameter_switch('groupRecursion', 0); $values['groupRecursion'] = \get_parameter_switch('groupRecursion', 0);
$values['secondaryGroup'] = \get_parameter('secondaryGroup', 0);
$values['customFilter'] = \get_parameter('customFilter', -1); $values['customFilter'] = \get_parameter('customFilter', -1);
$values['columns_events_widget'] = \get_parameter('columns_events_widget', []); $values['columns_events_widget'] = \get_parameter('columns_events_widget', []);
@ -721,6 +738,7 @@ class EventsListWidget extends Widget
$this->values['limit'] = $config['block_size']; $this->values['limit'] = $config['block_size'];
} }
$filter['search_secondary_groups'] = $this->values['secondaryGroup'];
// Print datatable. // Print datatable.
$output .= ui_print_datatable( $output .= ui_print_datatable(
[ [