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

Merge branch '823-alert-action-fields-infinite-wait-dev' into 'develop'

Browse Source 
Changed bad jquery get call in alert actions and alerts snmp.

See merge request !441
This commit is contained in:
vgilc 2017-05-08 17:30:02 +02:00
commit fd6ff530c7
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -265,7 +265,7 @@ $(document).ready (function () {
name: "id", name: "id",
value: this.value}); value: this.value});
jQuery.get (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>, jQuery.post (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>,
values, values,
function (data, status) { function (data, status) {
original_command = js_html_entity_decode (data["command"]); original_command = js_html_entity_decode (data["command"]);
@ -274,6 +274,7 @@ $(document).ready (function () {
render_command_description(command_description); render_command_description(command_description);
var max_fields = parseInt('<?php echo $config["max_macro_fields"]; ?>'); var max_fields = parseInt('<?php echo $config["max_macro_fields"]; ?>');
for (i = 1; i <= max_fields; i++) { for (i = 1; i <= max_fields; i++) {
var old_value = ''; var old_value = '';
var old_recovery_value = ''; var old_recovery_value = '';

5
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -1394,10 +1394,7 @@ $(document).ready (function () {
name: "get_recovery_fields", name: "get_recovery_fields",
value: "0" value: "0"
}); });
jQuery.get ( jQuery.post (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>,
<?php
echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'";
?>,
values, values,
function (data, status) { function (data, status) {
var max_fields = parseInt('<?php echo $config["max_macro_fields"]; ?>'); var max_fields = parseInt('<?php echo $config["max_macro_fields"]; ?>');