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

2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/alerts/alert_list.builder.php: Fixed agent autocomplete
	in alert builder.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-06-01 13:31:52 +00:00
parent 75ebce15a2
commit ddfe043c5b
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed agent autocomplete
in alert builder.
2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed group recursion * godmode/massive/massive_edit_modules.php: Fixed group recursion

29
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -141,6 +141,7 @@ ui_require_jquery_file ('bgiframe');
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
$(document).ready (function () { $(document).ready (function () {
$("#text_id_agent").autocomplete({ $("#text_id_agent").autocomplete({
minLength: 2, minLength: 2,
source: function( request, response ) { source: function( request, response ) {
@ -196,11 +197,35 @@ $(document).ready (function () {
} }
}); });
}); });
return false; return false;
} }
}) })
.data( "autocomplete")._renderItem = function( ul, item ) {
if (item.ip == "") {
text = "<a>" + item.name + "</a>";
}
else {
text = "<a>" + item.name
+ "<br><span style=\"font-size: 70%; font-style: italic;\">IP:" + item.ip + "</span></a>";
}
return $("<li></li>")
.data("item.autocomplete", item)
.append(text)
.appendTo(ul);
};
//Force the size of autocomplete
$(".ui-autocomplete").css("max-height", "100px");
$(".ui-autocomplete").css("overflow-y", "auto");
/* prevent horizontal scrollbar */
$(".ui-autocomplete").css("overflow-x", "hidden");
/* add padding to account for vertical scrollbar */
$(".ui-autocomplete").css("padding-right", "20px");
//Force to style of items
$(".ui-autocomplete").css("text-align", "left");
<?php if (! $id_agente) : ?> <?php if (! $id_agente) : ?>
$("#id_group").pandoraSelectGroupAgent ({ $("#id_group").pandoraSelectGroupAgent ({