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-9867-ips-custom-no-actualizan-al-cambiarlas-en-politica' into 'develop' 

Ent 9867 ips custom no actualizan al cambiarlas en politica

See merge request artica/pandorafms!5802
This commit is contained in:
Rafael Ameijeiras 2023-06-29 09:52:09 +00:00
parent 3c87f090d5 d446812018
commit 9e6595be18
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/godmode/agentes/module_manager_editor_network.php
View File

@ -90,14 +90,9 @@ push_table_simple($data, 'caption_target_ip');
$data = []; $data = [];
// Show agent_for defect. // Show agent_for defect.
if ($page === 'enterprise/godmode/policies/policy_modules') { if ($page === 'enterprise/godmode/policies/policy_modules') {
if (empty($ip_target) === false && $ip_target !== 'auto') { if ($ip_target !== 'auto' && $ip_target !== 'force_pri') {
$custom_ip_target = $ip_target; $custom_ip_target = $ip_target;
$ip_target = 'custom'; $ip_target = 'custom';
} else if (empty($ip_target) === true) {
$ip_target = 'force_pri';
$custom_ip_target = '';
} else {
$custom_ip_target = '';
} }
$target_ip_values = []; $target_ip_values = [];
@ -725,9 +720,13 @@ $(document).ready (function () {
}); });
var custom_ip_target = "<?php echo $custom_ip_target; ?>"; var custom_ip_target = "<?php echo $custom_ip_target; ?>";
if(custom_ip_target == ''){ var ip_target = "<?php echo $ip_target; ?>";
if(ip_target === 'custom'){
$("#text-custom_ip_target").show();
} else {
$("#text-custom_ip_target").hide(); $("#text-custom_ip_target").hide();
} }
$('#ip_target').change(function() { $('#ip_target').change(function() {
if($(this).val() === 'custom') { if($(this).val() === 'custom') {
$("#text-custom_ip_target").show(); $("#text-custom_ip_target").show();

13
pandora_console/godmode/agentes/module_manager_editor_wmi.php
View File

@ -43,14 +43,9 @@ if (empty($edit_module)) {
$data = []; $data = [];
if ($page == 'enterprise/godmode/policies/policy_modules') { if ($page == 'enterprise/godmode/policies/policy_modules') {
if ($ip_target != 'auto' && $ip_target != '') { if ($ip_target !== 'auto' && $ip_target !== 'force_pri') {
$custom_ip_target = $ip_target; $custom_ip_target = $ip_target;
$ip_target = 'custom'; $ip_target = 'custom';
} else if ($ip_target == '') {
$ip_target = 'force_pri';
$custom_ip_target = '';
} else {
$custom_ip_target = '';
} }
$target_ip_values = []; $target_ip_values = [];
@ -240,9 +235,13 @@ push_table_simple($data, 'key_field');
<script type="text/javascript"> <script type="text/javascript">
$(document).ready (function () { $(document).ready (function () {
var custom_ip_target = "<?php echo $custom_ip_target; ?>"; var custom_ip_target = "<?php echo $custom_ip_target; ?>";
if(custom_ip_target == ''){ var ip_target = "<?php echo $ip_target; ?>";
if(ip_target === 'custom'){
$("#text-custom_ip_target").show();
} else {
$("#text-custom_ip_target").hide(); $("#text-custom_ip_target").hide();
} }
$('#ip_target').change(function() { $('#ip_target').change(function() {
if($(this).val() == 'custom') { if($(this).val() == 'custom') {
$("#text-custom_ip_target").show(); $("#text-custom_ip_target").show();