From 4afb03d1f82eddf5b40f6b7c82d9dc88aaed4935 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 19 Feb 2013 10:57:37 +0000 Subject: [PATCH] 2013-02-19 Sergio Martin * include/javascript/pandora_modules.js: Fixed str_warning and str_critical assignation when apply a network_component Merged from 4.0.3 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7679 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/include/javascript/pandora_modules.js | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 18aedf14a2..aa9b346cb6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-02-19 Sergio Martin + + * include/javascript/pandora_modules.js: Fixed str_warning and + str_critical assignation when apply a network_component + Merged from 4.0.3 + 2013-02-19 Miguel de Dios * include/javascript/jquery.pandora.js: fixed the popup window for diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index 535f0debd2..1293bc6b13 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -289,10 +289,10 @@ function configure_modules_form () { $("#checkbox-history_data").uncheck (); $("#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-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-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-post_process").attr("value", (data["post_process"] == 0) ? 0 : data["post_process"]); $("#text-unit").attr("value", (data["unit"] == '') ? '' : data["unit"])