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

Activate menu search form on URL path match and ignore params

This commit is contained in:
Thomas Gelf 2014-03-25 12:27:35 +00:00
parent 18b825a24b
commit ac90ccfd22
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/icinga/loader.js
View File

@ -239,7 +239,7 @@
if (! req.autorefresh) { if (! req.autorefresh) {
// TODO: Hook for response/url? // TODO: Hook for response/url?
var $forms = $('[action="' + url + '"]'); var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
var $matches = $.merge($('[href="' + url + '"]'), $forms); var $matches = $.merge($('[href="' + url + '"]'), $forms);
$matches.each(function (idx, el) { $matches.each(function (idx, el) {
if ($(el).closest('#menu').length) { if ($(el).closest('#menu').length) {
@ -332,7 +332,8 @@
// Handle search requests, still hardcoded. // Handle search requests, still hardcoded.
if (req.url.match(/^\/search/) && if (req.url.match(/^\/search/) &&
req.$target.data('icingaUrl').match(/^\/search/)) req.$target.data('icingaUrl').match(/^\/search/)
&& $('.dashboard', $resp).length > 0)
{ {
// TODO: We need dashboard pane and container identifiers (not ids) // TODO: We need dashboard pane and container identifiers (not ids)
var targets = []; var targets = [];