tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop'

Browse Source 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
This commit is contained in:
Daniel Rodriguez 2021-03-04 10:43:29 +00:00
commit d6b7b46139
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/javascript/pandora_alerts.js
View File

@ -1,4 +1,5 @@
var original_command = ""; /* globals $ */
function parse_alert_command(command, classs) { function parse_alert_command(command, classs) {
if (classs == "recovery") { if (classs == "recovery") {
classs = "fields_recovery"; classs = "fields_recovery";
@ -9,16 +10,20 @@ function parse_alert_command(command, classs) {
var nfield = 1; var nfield = 1;
$("." + classs).each(function() { $("." + classs).each(function() {
// Only render values different from '' // Only render values different from ''
if ($(this).val() == "") {
nfield++;
return;
}
var field = "_field" + nfield + "_"; var field = "_field" + nfield + "_";
var regex = new RegExp(field, "gi"); var regex = new RegExp(field, "gi");
console.log($(this).val());
if ($(this).css("-webkit-text-security") == "disc") { if ($(this).val() == "") {
if (
classs == "fields_recovery" &&
$($(".fields")[nfield - 1]).val() != ""
) {
command = command.replace(
regex,
"[RECOVER]" + $($(".fields")[nfield - 1]).val()
);
}
} else if ($(this).css("-webkit-text-security") == "disc") {
var hidden_character = "*"; var hidden_character = "*";
var hidden_string = hidden_character.repeat($(this).val().length); var hidden_string = hidden_character.repeat($(this).val().length);

6
pandora_console/include/styles/pandora.css
View File

@ -3174,6 +3174,12 @@ table.alert_escalation th img {
width: 18px; width: 18px;
} }
.action_details td.used_field {
background: #6eb432;
color: #8d8d8d;
font-weight: normal;
}
td.used_field { td.used_field {
background: #6eb432; background: #6eb432;
color: #ffffff; color: #ffffff;