Merge branch 'cherry-pick-7db496e7' into 'pandora_6.0'

Merge branch '44-las-plantillas-de-modulos-no-guardan-la-unidad-de-los-modulos-c…

See merge request !121
This commit is contained in:
vgilc 2017-02-20 16:35:47 +01:00
commit 45944dd1de
2 changed files with 5 additions and 2 deletions

View File

@ -81,6 +81,7 @@ if (isset ($_POST["template_id"])) {
'plugin_user' => $row2["plugin_user"], 'plugin_user' => $row2["plugin_user"],
'plugin_pass' => $row2["plugin_pass"], 'plugin_pass' => $row2["plugin_pass"],
'plugin_parameter' => $row2["plugin_parameter"], 'plugin_parameter' => $row2["plugin_parameter"],
'unit' => $row2["unit"],
'max_timeout' => $row2["max_timeout"], 'max_timeout' => $row2["max_timeout"],
'max_retries' => $row2["max_retries"], 'max_retries' => $row2["max_retries"],
'id_plugin' => $row2['id_plugin'], 'id_plugin' => $row2['id_plugin'],

View File

@ -113,7 +113,9 @@ push_table_row ($data, 'tcp_receive');
function validate_post_process() { function validate_post_process() {
var post_process = $("#text-post_process").val(); var post_process = $("#text-post_process").val();
var new_post_process = post_process.replace(',','.'); if (post_process != undefined){
$("#text-post_process").val(new_post_process); var new_post_process = post_process.replace(',','.');
$("#text-post_process").val(new_post_process);
}
} }
</script> </script>