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

updates

This commit is contained in:
marcos 2021-08-26 12:42:16 +02:00
parent 24a66f0173
commit 2ed657c166
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/lib/Group.php
View File

@ -386,7 +386,7 @@ class Group extends Entity
$search = get_parameter('search', ''); $search = get_parameter('search', '');
$step = get_parameter('step', 1); $step = get_parameter('step', 1);
$limit = get_parameter('limit', false); $limit = get_parameter('limit', false);
$not_condition = get_parameter('not_condition', ''); $not_condition = get_parameter('not_condition', false);
$exclusions = get_parameter('exclusions', '[]'); $exclusions = get_parameter('exclusions', '[]');
$inclusions = get_parameter('inclusions', '[]'); $inclusions = get_parameter('inclusions', '[]');
@ -432,7 +432,7 @@ class Group extends Entity
$return = self::prepareGroups($groups); $return = self::prepareGroups($groups);
// When not_condition is select firts option text change All to None. // When not_condition is select firts option text change All to None.
if ($not_condition === 'on') { if ($not_condition === 'true') {
$return[0]['text'] = 'None'; $return[0]['text'] = 'None';
} }

22
pandora_console/operation/agentes/status_monitor.php
View File

@ -2062,18 +2062,6 @@ function refresh_pagination_callback (module_id, id_agent, server_name,module_na
function changeNotConditionStatus() { function changeNotConditionStatus() {
let chkbox =document.getElementById('not_condition_switch'); let chkbox =document.getElementById('not_condition_switch');
if(chkbox.checked) { if(chkbox.checked) {
/*
$('#status').select2().on("select2:open", function(e) {
var a = $('#select2-status-results > li');
console.log($(".select2-results__option")[0].textContent);
$(".select2-results__option")[1].textContent = "None";
});*/
$('#status').select2().on("select2:open", function(e) {
console.log(e);
// $("#select2-status-results > li")[1].innerHTML = "none";
});
document.getElementById("select2-status-container").innerHTML = "None"; document.getElementById("select2-status-container").innerHTML = "None";
document.getElementById("select2-moduletype-container").innerHTML = "None"; document.getElementById("select2-moduletype-container").innerHTML = "None";
document.getElementById("select2-ag_group-container").innerHTML = "None"; document.getElementById("select2-ag_group-container").innerHTML = "None";
@ -2081,6 +2069,10 @@ function changeNotConditionStatus() {
document.getElementById("select2-tag_filter-container").innerHTML = "None"; document.getElementById("select2-tag_filter-container").innerHTML = "None";
$('select[name=datatypebox] > option:first-child').val('None'); $('select[name=datatypebox] > option:first-child').val('None');
$('#datatypebox option:first').text('None'); $('#datatypebox option:first').text('None');
$('select[name=status] > option:first-child').text('None');
$('select[name=moduletype] > option:first-child').text('None');
$('select[name=modulegroup] > option:first-child').text('None');
$('select[name=tag_filter] > option:first-child').text('None');
}else { }else {
document.getElementById("select2-status-container").innerHTML = "All"; document.getElementById("select2-status-container").innerHTML = "All";
@ -2089,8 +2081,10 @@ function changeNotConditionStatus() {
document.getElementById("select2-modulegroup-container").innerHTML = "All"; document.getElementById("select2-modulegroup-container").innerHTML = "All";
document.getElementById("select2-tag_filter-container").innerHTML = "All"; document.getElementById("select2-tag_filter-container").innerHTML = "All";
$('#datatypebox option:first').text('All'); $('#datatypebox option:first').text('All');
$('select[name=status] > option:first-child').text('All');
$('select[name=moduletype] > option:first-child').text('All');
$('select[name=modulegroup] > option:first-child').text('All');
$('select[name=tag_filter] > option:first-child').text('All');
} }
} }