From 4b00e8ee3c8dc87f81dfa8b619f01161b2797291 Mon Sep 17 00:00:00 2001
From: Daniel Barbero Martin <daniel.barbero@artica.es>
Date: Wed, 22 Jun 2022 10:29:19 +0200
Subject: [PATCH] refactor events meta pandora_enterprise#9086
---
.../include/javascript/pandora_events.js | 16 ++++++++--------
pandora_console/operation/events/events.php | 4 ++++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 4aefad62c2..b4e2b66787 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -697,7 +697,7 @@ function update_event(table, id_evento, type, event_rep, row, server_id) {
function validate_event(table, id_evento, event_rep, row, server_id) {
var button = document.getElementById("val-" + id_evento);
var meta = $("#hidden-meta").val();
- if (meta) {
+ if (meta != 0) {
button = document.getElementById("val-" + id_evento + "-" + server_id);
}
@@ -722,7 +722,7 @@ function validate_event(table, id_evento, event_rep, row, server_id) {
function in_process_event(table, id_evento, event_rep, row, server_id) {
var button = document.getElementById("proc-" + id_evento);
var meta = $("#hidden-meta").val();
- if (meta) {
+ if (meta != 0) {
button = document.getElementById("proc-" + id_evento + "-" + server_id);
}
@@ -747,7 +747,7 @@ function in_process_event(table, id_evento, event_rep, row, server_id) {
function delete_event(table, id_evento, event_rep, row, server_id) {
var button = document.getElementById("del-" + id_evento);
var meta = $("#hidden-meta").val();
- if (meta) {
+ if (meta != 0) {
button = document.getElementById("del-" + id_evento + "-" + server_id);
}
@@ -791,7 +791,7 @@ function execute_delete_event_reponse(
) {
var button = document.getElementById("del-" + id_evento);
var meta = $("#hidden-meta").val();
- if (meta) {
+ if (meta != 0) {
button = document.getElementById("del-" + id_evento + "-" + server_id);
}
@@ -899,7 +899,7 @@ function execute_event_response(event_list_btn) {
var event_id = $(this).val();
var meta = $("#hidden-meta").val();
var server_id = 0;
- if (meta) {
+ if (meta != 0) {
var split_id = event_id.split("|");
event_id = split_id[0];
server_id = split_id[1];
@@ -919,7 +919,7 @@ function execute_event_response(event_list_btn) {
var event_id = $(this).val();
var meta = $("#hidden-meta").val();
var server_id = 0;
- if (meta) {
+ if (meta != 0) {
var split_id = event_id.split("|");
event_id = split_id[0];
server_id = split_id[1];
@@ -939,7 +939,7 @@ function execute_event_response(event_list_btn) {
var event_id = $(this).val();
var meta = $("#hidden-meta").val();
var server_id = 0;
- if (meta) {
+ if (meta != 0) {
var split_id = event_id.split("|");
event_id = split_id[0];
server_id = split_id[1];
@@ -977,7 +977,7 @@ function check_massive_response_event(
var event_id = $(this).val();
var meta = $("#hidden-meta").val();
var server_id = 0;
- if (meta) {
+ if (meta != 0) {
var split_id = event_id.split("|");
event_id = split_id[0];
server_id = split_id[1];
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 4e99379071..45b405b6e1 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -754,6 +754,10 @@ if (is_ajax() === true) {
);
$tmp->options .= '</a>';
+ if (isset($tmp->server_id) === false) {
+ $tmp->server_id = 0;
+ }
+
if ((int) $tmp->user_can_write === 1) {
if ((int) $tmp->estado !== 1) {
// Validate.