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

2014-03-27 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/alerts/alert_commands.php
	  godmode/snmpconsole/snmp_alert.php: Fixed
	bug:load recovery fields of alert actions.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2014-03-27 13:02:34 +00:00
parent 969ce6e855
commit f799be11bd
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-03-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alert_commands.php
godmode/snmpconsole/snmp_alert.php: Fixed
bug:load recovery fields of alert actions.
2014-03-27 Alejandro Gallardo <alejandro.gallardo@artica.es> 2014-03-27 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_config.php, * include/functions_config.php,

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

@ -40,6 +40,7 @@ if (is_ajax ()) {
$get_alert_command = (bool) get_parameter ('get_alert_command'); $get_alert_command = (bool) get_parameter ('get_alert_command');
if ($get_alert_command) { if ($get_alert_command) {
$id = (int) get_parameter ('id', 0); $id = (int) get_parameter ('id', 0);
$get_recovery_fields = (int) get_parameter('get_recovery_fields', 1);
// If command ID is not provided, check for action id // If command ID is not provided, check for action id
if ($id == 0) { if ($id == 0) {
@ -107,17 +108,13 @@ if (is_ajax ()) {
} }
else { else {
$fields_rows[$i] = $fields_rows[$i] =
'<tr id="table_macros-field' . $i . '" class="datos"> '<tr id="table_macros-field' . $i . '" class="datos">';
<td style="font-weight:bold;width:20%" class="datos"> $fields_rows[$i] .= '<td style="font-weight:bold;width:20%" class="datos">' . $fdesc . '</td>';
' . $fdesc . ' $fields_rows[$i] .= '<td class="datos">' . $ffield . '</td>';
</td> if ($get_recovery_fields) {
<td class="datos"> $fields_rows[$i] .= '<td class="datos recovery_col">' . $rfield . '</td>';
' . $ffield . ' }
</td> $fields_rows[$i] .= '</tr>';
<td class="datos recovery_col">
' . $rfield . '
</td>
</tr>';
} }
} }

4
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -1080,6 +1080,10 @@ $(document).ready (function () {
value: this.value value: this.value
}); });
values.push ({
name: "get_recovery_fields",
value: "0"
});
jQuery.get ( jQuery.get (
<?php <?php
echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'"; echo "'" . ui_get_full_url("ajax.php", false, false, false) . "'";