diff --git a/html/ajax_dash.php b/html/ajax_dash.php
index 0ffc580679..6b268f889b 100644
--- a/html/ajax_dash.php
+++ b/html/ajax_dash.php
@@ -35,6 +35,7 @@ if ($type == 'placeholder') {
elseif (is_file('includes/common/'.$type.'.inc.php')) {
$results_limit = 10;
+ $typeahead_limit = $config['webui']['global_search_result_limit'];
$no_form = true;
$title = ucfirst($type);
$unique_id = str_replace(array("-","."),"_",uniqid($type,true));
diff --git a/html/includes/common/generic-graph.inc.php b/html/includes/common/generic-graph.inc.php
index 038154e5c0..022fb0585c 100644
--- a/html/includes/common/generic-graph.inc.php
+++ b/html/includes/common/generic-graph.inc.php
@@ -204,6 +204,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_device.ttAdapter(),
+ limit: '.$typeahead_limit.',
async: false,
templates: {
header: "
Devices
",
@@ -240,6 +241,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_port.ttAdapter(),
+ limit: '.$typeahead_limit.',
async: false,
templates: {
header: " Ports
",
@@ -275,6 +277,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_application.ttAdapter(),
+ limit: '.$typeahead_limit.',
async: false,
templates: {
header: " Applications
",
@@ -312,6 +315,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_munin.ttAdapter(),
+ limit: '.$typeahead_limit.',
async: false,
templates: {
header: " Munin
",
@@ -346,6 +350,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_bill.ttAdapter(),
+ limit: '.$typeahead_limit.',
async: false,
templates: {
header: " Bill
",
@@ -432,3 +437,4 @@ else {
$common_output[] = '
';
}
+
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index afc91e645f..1ccdb32d9c 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -3,8 +3,9 @@ require $config['install_dir'].'/includes/object-cache.inc.php';
// FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
-$service_status = get_service_status();
-$if_alerts = dbFetchCell("SELECT COUNT(port_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
+$service_status = get_service_status();
+$typeahead_limit = $config['webui']['global_search_result_limit'];
+$if_alerts = dbFetchCell("SELECT COUNT(port_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
if ($_SESSION['userlevel'] >= 5) {
$links['count'] = dbFetchCell("SELECT COUNT(*) FROM `links`");
@@ -717,6 +718,7 @@ $('#gsearch').typeahead({
},
{
source: devices.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
@@ -727,6 +729,7 @@ $('#gsearch').typeahead({
},
{
source: ports.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
@@ -737,6 +740,7 @@ $('#gsearch').typeahead({
},
{
source: bgp.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
@@ -749,3 +753,4 @@ $('#gsearch').bind('typeahead:open', function(ev, suggestion) {
$('#gsearch').addClass('search-box');
});
+