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

Fixed the javascript to load local components of type string and with empty strings in critical and warnings. TICKET: #2584 

(cherry picked from commit a18484ffa2)
This commit is contained in:
mdtrooper 2015-08-18 16:02:45 +02:00
parent 032c63adc7
commit 819ad1da54
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/javascript/pandora_modules.js
View File

@ -102,15 +102,17 @@ function configure_modules_form () {
} }
$("#component_loading").show (); $("#component_loading").show ();
$(".error").hide (); $(".error").hide ();
jQuery.post ("ajax.php", jQuery.post ("ajax.php", {
{"page" : "godmode/agentes/module_manager_editor", "page" : "godmode/agentes/module_manager_editor",
"get_module_local_component" : 1, "get_module_local_component" : 1,
"id_module_component" : this.value "id_module_component" : this.value
}, },
function (data, status) { function (data, status) {
configuration_data = js_html_entity_decode (data['data']); configuration_data = js_html_entity_decode (data['data']);
$("#text-name").attr ("value", js_html_entity_decode (data["name"])); $("#text-name").attr ("value",
$("#textarea_description").attr ("value", js_html_entity_decode (data["description"])); js_html_entity_decode (data["name"]));
$("#textarea_description").attr ("value",
js_html_entity_decode (data["description"]));
$("#textarea_configuration_data").val(configuration_data); $("#textarea_configuration_data").val(configuration_data);
$("#component_loading").hide (); $("#component_loading").hide ();
$("#id_module_type").val(data["type"]); $("#id_module_type").val(data["type"]);
@ -121,7 +123,8 @@ function configure_modules_form () {
period_select_module_interval_update(data["module_interval"]); period_select_module_interval_update(data["module_interval"]);
} }
else { else {
period_select_update('module_interval', data["module_interval"]); period_select_update('module_interval',
data["module_interval"]);
} }
$("#id_module_group").val (data["id_module_group"]); $("#id_module_group").val (data["id_module_group"]);
@ -130,12 +133,13 @@ function configure_modules_form () {
$("#checkbox-history_data").check (); $("#checkbox-history_data").check ();
else else
$("#checkbox-history_data").uncheck (); $("#checkbox-history_data").uncheck ();
$("#text-min_warning").attr ("value", (data["min_warning"] == 0) ? 0 : data["min_warning"]); $("#text-min_warning").attr ("value", (data["min_warning"] == 0) ? 0 : data["min_warning"]);
$("#text-max_warning").attr ("value", (data["max_warning"] == 0) ? 0 : data["max_warning"]); $("#text-max_warning").attr ("value", (data["max_warning"] == 0) ? 0 : data["max_warning"]);
$("#text-str_warning").attr ("value", (data["str_warning"] == 0) ? 0 : data["str_warning"]); $("#text-str_warning").attr ("value", data["str_warning"]);
$("#text-min_critical").attr ("value", (data["min_critical"] == 0) ? 0 : data["min_critical"]); $("#text-min_critical").attr ("value", (data["min_critical"] == 0) ? 0 : data["min_critical"]);
$("#text-max_critical").attr ("value", (data["max_critical"] == 0) ? 0 : data["max_critical"]); $("#text-max_critical").attr ("value", (data["max_critical"] == 0) ? 0 : data["max_critical"]);
$("#text-str_critical").attr ("value", (data["str_critical"] == 0) ? 0 : data["str_critical"]); $("#text-str_critical").attr ("value", data["str_critical"]);
$("#text-ff_event").attr ("value", (data["min_ff_event"] == 0) ? 0 : data["min_ff_event"]); $("#text-ff_event").attr ("value", (data["min_ff_event"] == 0) ? 0 : data["min_ff_event"]);
$("#text-post_process").attr("value", (data["post_process"] == 0) ? 0 : data["post_process"]); $("#text-post_process").attr("value", (data["post_process"] == 0) ? 0 : data["post_process"]);
$("#text-unit").attr("value", (data["unit"] == '') ? '' : data["unit"]) $("#text-unit").attr("value", (data["unit"] == '') ? '' : data["unit"])