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

2013-06-17 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/alerts/configure_alert_action.php,
	godmode/alerts/alert_commands.php: fixed the duplicated the rows
	and did'nt hide the macros field rows.
	
	Fixes: #2294




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-17 12:33:34 +00:00
parent cd25df8283
commit 002cf78783
3 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php,
godmode/alerts/alert_commands.php: fixed the duplicated the rows
and did'nt hide the macros field rows.
Fixes: #2294
2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed in the function "get_snmpwalk" the

2
pandora_console/godmode/alerts/alert_commands.php
View File

@ -104,7 +104,7 @@ if (is_ajax ()) {
}
else {
$fields_rows[$i] =
'<tr id="table1-field' . $i . '" class="datos">
'<tr id="table_macros-field' . $i . '" class="datos">
<td style="font-weight:bold;width:20%" class="datos">
' . $fdesc . '
</td>

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

@ -40,18 +40,18 @@ else
$sec = 'galertas';
if ($al_action !== false) {
$own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
$own_groups = array_keys(users_get_groups($config['id_user'], "LM"));
else
$own_groups = array_keys(users_get_groups($config['id_user'], "LM", false));
$is_in_group = in_array($al_action['id_group'], $own_groups);
// Header
if (defined('METACONSOLE'))
alerts_meta_print_header();
else
ui_print_page_header (__('Alerts').' &raquo; '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true);
$own_info = get_user_info ($config['id_user']);
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
$own_groups = array_keys(users_get_groups($config['id_user'], "LM"));
else
$own_groups = array_keys(users_get_groups($config['id_user'], "LM", false));
$is_in_group = in_array($al_action['id_group'], $own_groups);
// Header
if (defined('METACONSOLE'))
alerts_meta_print_header();
else
ui_print_page_header (__('Alerts').' &raquo; '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true);
}
else {
// Header
@ -173,12 +173,16 @@ $(document).ready (function () {
$("#id_command").change (function () {
values = Array ();
values.push ({name: "page",
values.push({
name: "page",
value: "godmode/alerts/alert_commands"});
values.push ({name: "get_alert_command",
values.push({
name: "get_alert_command",
value: "1"});
values.push ({name: "id",
values.push({
name: "id",
value: this.value});
jQuery.get (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>,
values,
function (data, status) {
@ -186,26 +190,38 @@ $(document).ready (function () {
render_command_preview (original_command);
command_description = js_html_entity_decode (data["description"]);
render_command_description(command_description);
for (i=1; i<=10; i++) {
for (i = 1; i <= 10; i++) {
var old_value = '';
var field_row = data["fields_rows"][i];
// Only keep the value if is provided from hidden (first time)
if ($("[name=field"+i+"_value]").attr('id') == "hidden-field" + i + "_value") {
old_value = $("[name=field"+i+"_value]").val();
if (($("[name=field" + i + "_value]").attr('id'))
== ("hidden-field" + i + "_value")) {
old_value = $("[name=field" + i + "_value]").val();
}
// If the row is empty, hide de row
if(data["fields_rows"][i] == '') {
$('#table_macros-field'+i).hide();
if (field_row == '') {
$('#table_macros-field' + i).hide();
}
else {
$('#table_macros-field'+i).replaceWith(data["fields_rows"][i]);
$("[name=field"+i+"_value]").val(old_value);
$('#table_macros-field' + i).replaceWith(field_row);
$("[name=field" + i + "_value]").val(old_value);
// Add help hint only in first field
if(i == 1) {
var td_content = $('#table_macros-field'+i).find('td').eq(0);
td_content.html(td_content.html() + $('#help_alert_macros_hint').html());
if (i == 1) {
var td_content = $('#table_macros-field' + i)
.find('td').eq(0);
$(td_content)
.html(
$(td_content).html() + $('#help_alert_macros_hint').html());
}
$('#table_macros-field').show();
$('#table_macros-field' + i).show();
}
}