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

2012-02-08 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/events/custom_events.php: Remove comments.

	* operation/events/events_list.php: Show criticity only for
	  alerts.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-08 09:50:36 +00:00
parent 476fcb0ae0
commit 1db6a0f47a
3 changed files with 14 additions and 9 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 @@
2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php: Remove comments.
* operation/events/events_list.php: Show criticity only for
alerts.
2012-02-07 Vanessa Gil <vanessa.gil@artica.es> 2012-02-07 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql * pandoradb.sql
pandoradb.postgreSQL.sql pandoradb.postgreSQL.sql

3
pandora_console/godmode/events/custom_events.php
View File

@ -123,9 +123,7 @@ $(document).ready (function () {
field_name = $(value).html(); field_name = $(value).html();
if (field_name != <?php echo "'".__('None')."'"; ?>){ if (field_name != <?php echo "'".__('None')."'"; ?>){
id_field = $(value).attr('value'); id_field = $(value).attr('value');
//$("select[name='fields_available[]']").append($("<option selected='selected'></option>").val(field_name));
$("select[name='fields_selected[]']").append($("<option selected='selected'></option>").html(field_name).attr("value", field_name)); $("select[name='fields_selected[]']").append($("<option selected='selected'></option>").html(field_name).attr("value", field_name));
//$("select[name='fields_selected[]']").append($("<option></option>").val(field_name).html('<i>' + field_name + '</i>'));
$("#fields_available").find("option[value='" + id_field + "']").remove(); $("#fields_available").find("option[value='" + id_field + "']").remove();
} }
}); });
@ -136,7 +134,6 @@ $(document).ready (function () {
field_name = $(value).html(); field_name = $(value).html();
if (field_name != <?php echo "'".__('None')."'"; ?>){ if (field_name != <?php echo "'".__('None')."'"; ?>){
id_field = $(value).attr('value'); id_field = $(value).attr('value');
//alert(id_field);
$("select[name='fields_available[]']").append($("<option></option>").val(field_name).html('<i>' + field_name + '</i>')); $("select[name='fields_available[]']").append($("<option></option>").val(field_name).html('<i>' + field_name + '</i>'));
$("#fields_selected").find("option[value='" + id_field + "']").remove(); $("#fields_selected").find("option[value='" + id_field + "']").remove();
} }

14
pandora_console/operation/events/events_list.php
View File

@ -825,6 +825,13 @@ foreach ($result as $event) {
$string .= '</a></td></tr><tr class="' . $odd . '">'; $string .= '</a></td></tr><tr class="' . $odd . '">';
//$odd = ''; //$odd = '';
$odd = ($odd == '')? 'rowOdd' : ''; $odd = ($odd == '')? 'rowOdd' : '';
if ($event["criticity"] != '') {
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Criticity') . '</td><td align="left">';
$string .= $event["criticity"];
$string .= '</td></tr><tr>';
$odd = ($odd == '')? 'rowOdd' : '';
}
} }
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
@ -885,12 +892,7 @@ foreach ($result as $event) {
$string .= '<i>- ' . __('Empty') . ' -</i>'; $string .= '<i>- ' . __('Empty') . ' -</i>';
$odd = ($odd == '')? 'rowOdd' : ''; $odd = ($odd == '')? 'rowOdd' : '';
} }
if ($event["criticity"] != '') {
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Criticity') . '</td><td align="left">';
$string .= $event["criticity"];
$string .= '</td></tr><tr>';
$odd = ($odd == '')? 'rowOdd' : '';
}
$string .= '</td></tr>'; $string .= '</td></tr>';
$string .= '</table>'; $string .= '</table>';