tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop' 

event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
This commit is contained in:
Daniel Rodriguez 2022-10-25 09:05:43 +00:00
parent ce4fc25209 6ef3505eab
commit b6a38e1b7a
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/javascript/pandora_events.js
View File

@ -707,7 +707,7 @@ function execute_event_response(event_list_btn) {
} }
in_process_event( in_process_event(
"events", "table_events",
event_id, event_id,
$(this).attr("event_rep"), $(this).attr("event_rep"),
this.parentElement.parentElement, this.parentElement.parentElement,
@ -727,7 +727,7 @@ function execute_event_response(event_list_btn) {
} }
validate_event( validate_event(
"events", "table_events",
event_id, event_id,
$(this).attr("event_rep"), $(this).attr("event_rep"),
this.parentElement.parentElement, this.parentElement.parentElement,
@ -747,7 +747,7 @@ function execute_event_response(event_list_btn) {
} }
execute_delete_event_reponse( execute_delete_event_reponse(
"events", "table_events",
event_id, event_id,
$(this).attr("event_rep"), $(this).attr("event_rep"),
this.parentElement.parentElement, this.parentElement.parentElement,

14
pandora_console/operation/events/events.php
View File

@ -1449,7 +1449,7 @@ if ($pure) {
).'</a>'; ).'</a>';
// If the user has administrator permission display manage tab. // If the user has administrator permission display manage tab.
if ($event_w || $event_m) { if ($event_w === true || $event_m === true) {
// Manage events. // Manage events.
$manage_events['active'] = false; $manage_events['active'] = false;
$manage_events['text'] = '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=filter&amp;pure='.$config['pure'].'">'.html_print_image( $manage_events['text'] = '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=filter&amp;pure='.$config['pure'].'">'.html_print_image(
@ -1776,7 +1776,7 @@ $buttons[] = [
'onclick' => '', 'onclick' => '',
]; ];
if ($event_w || $event_m) { if ($event_w === true || $event_m === true) {
$buttons[] = [ $buttons[] = [
'id' => 'save-filter', 'id' => 'save-filter',
'class' => 'float-left margin-right-2 sub wand', 'class' => 'float-left margin-right-2 sub wand',
@ -2402,6 +2402,16 @@ if (is_user_admin($config['id_user'])) {
); );
} }
$array_events_actions = [];
if ($event_w === true && $readonly === false) {
$array_events_actions['in_progress_selected'] = __('In progress selected');
$array_events_actions['validate_selected'] = __('Validate selected');
}
if ($event_m === true && $readonly === false) {
$array_events_actions['delete_selected'] = __('Delete selected');
}
foreach ($event_responses as $val) { foreach ($event_responses as $val) {
$array_events_actions[$val['id']] = $val['name']; $array_events_actions[$val['id']] = $val['name'];
} }