mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
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:
parent
cd25df8283
commit
002cf78783
@ -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>
|
2013-06-17 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
* include/functions.php: fixed in the function "get_snmpwalk" the
|
* include/functions.php: fixed in the function "get_snmpwalk" the
|
||||||
|
@ -104,7 +104,7 @@ if (is_ajax ()) {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$fields_rows[$i] =
|
$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">
|
<td style="font-weight:bold;width:20%" class="datos">
|
||||||
' . $fdesc . '
|
' . $fdesc . '
|
||||||
</td>
|
</td>
|
||||||
|
@ -40,18 +40,18 @@ else
|
|||||||
$sec = 'galertas';
|
$sec = 'galertas';
|
||||||
|
|
||||||
if ($al_action !== false) {
|
if ($al_action !== false) {
|
||||||
$own_info = get_user_info ($config['id_user']);
|
$own_info = get_user_info ($config['id_user']);
|
||||||
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
|
if ($own_info['is_admin'] || check_acl ($config['id_user'], 0, "PM"))
|
||||||
$own_groups = array_keys(users_get_groups($config['id_user'], "LM"));
|
$own_groups = array_keys(users_get_groups($config['id_user'], "LM"));
|
||||||
else
|
else
|
||||||
$own_groups = array_keys(users_get_groups($config['id_user'], "LM", false));
|
$own_groups = array_keys(users_get_groups($config['id_user'], "LM", false));
|
||||||
$is_in_group = in_array($al_action['id_group'], $own_groups);
|
$is_in_group = in_array($al_action['id_group'], $own_groups);
|
||||||
|
|
||||||
// Header
|
// Header
|
||||||
if (defined('METACONSOLE'))
|
if (defined('METACONSOLE'))
|
||||||
alerts_meta_print_header();
|
alerts_meta_print_header();
|
||||||
else
|
else
|
||||||
ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true);
|
ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Header
|
// Header
|
||||||
@ -173,12 +173,16 @@ $(document).ready (function () {
|
|||||||
|
|
||||||
$("#id_command").change (function () {
|
$("#id_command").change (function () {
|
||||||
values = Array ();
|
values = Array ();
|
||||||
values.push ({name: "page",
|
values.push({
|
||||||
|
name: "page",
|
||||||
value: "godmode/alerts/alert_commands"});
|
value: "godmode/alerts/alert_commands"});
|
||||||
values.push ({name: "get_alert_command",
|
values.push({
|
||||||
|
name: "get_alert_command",
|
||||||
value: "1"});
|
value: "1"});
|
||||||
values.push ({name: "id",
|
values.push({
|
||||||
|
name: "id",
|
||||||
value: this.value});
|
value: this.value});
|
||||||
|
|
||||||
jQuery.get (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>,
|
jQuery.get (<?php echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; ?>,
|
||||||
values,
|
values,
|
||||||
function (data, status) {
|
function (data, status) {
|
||||||
@ -186,26 +190,38 @@ $(document).ready (function () {
|
|||||||
render_command_preview (original_command);
|
render_command_preview (original_command);
|
||||||
command_description = js_html_entity_decode (data["description"]);
|
command_description = js_html_entity_decode (data["description"]);
|
||||||
render_command_description(command_description);
|
render_command_description(command_description);
|
||||||
for (i=1; i<=10; i++) {
|
|
||||||
|
|
||||||
|
for (i = 1; i <= 10; i++) {
|
||||||
var old_value = '';
|
var old_value = '';
|
||||||
|
var field_row = data["fields_rows"][i];
|
||||||
|
|
||||||
// Only keep the value if is provided from hidden (first time)
|
// Only keep the value if is provided from hidden (first time)
|
||||||
if ($("[name=field"+i+"_value]").attr('id') == "hidden-field" + i + "_value") {
|
if (($("[name=field" + i + "_value]").attr('id'))
|
||||||
old_value = $("[name=field"+i+"_value]").val();
|
== ("hidden-field" + i + "_value")) {
|
||||||
|
old_value = $("[name=field" + i + "_value]").val();
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the row is empty, hide de row
|
// If the row is empty, hide de row
|
||||||
if(data["fields_rows"][i] == '') {
|
if (field_row == '') {
|
||||||
$('#table_macros-field'+i).hide();
|
$('#table_macros-field' + i).hide();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$('#table_macros-field'+i).replaceWith(data["fields_rows"][i]);
|
$('#table_macros-field' + i).replaceWith(field_row);
|
||||||
$("[name=field"+i+"_value]").val(old_value);
|
$("[name=field" + i + "_value]").val(old_value);
|
||||||
|
|
||||||
|
|
||||||
// Add help hint only in first field
|
// Add help hint only in first field
|
||||||
if(i == 1) {
|
if (i == 1) {
|
||||||
var td_content = $('#table_macros-field'+i).find('td').eq(0);
|
var td_content = $('#table_macros-field' + i)
|
||||||
td_content.html(td_content.html() + $('#help_alert_macros_hint').html());
|
.find('td').eq(0);
|
||||||
|
|
||||||
|
$(td_content)
|
||||||
|
.html(
|
||||||
|
$(td_content).html() + $('#help_alert_macros_hint').html());
|
||||||
}
|
}
|
||||||
$('#table_macros-field').show();
|
|
||||||
|
$('#table_macros-field' + i).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user