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

loader.js: Don't update history for redirects 

A redirect now also does NOT:

* Remove `.impact` from the container
* Try to set a menu item active..

fixes #4879
This commit is contained in:
Johannes Meyer 2022-07-20 10:10:30 +02:00
parent b201b030b2
commit c3b1ad12ab
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,58 +926,11 @@
req = reqOrError;
}
// Remove 'impact' class if there was such
if (req.$target.hasClass('impact')) {
req.$target.removeClass('impact');
} else {
var $impact = req.$target.find('.impact').first();
if ($impact.length) {
$impact.removeClass('impact');
}
}
if (req.getResponseHeader('X-Icinga-Reload-Window') === 'yes') {
window.location.reload();
return;
}
if (! req.autorefresh && ! req.autosubmit) {
// TODO: Hook for response/url?
var url = req.url;
if (req.$target[0].id === 'col1') {
this.icinga.behaviors.navigation.trySetActiveAndSelectedByUrl(url);
}
var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
var $matches = $.merge($('[href="' + url + '"]'), $forms);
$matches.each(function (idx, el) {
var $el = $(el);
if ($el.closest('#menu').length) {
if ($el.is('form')) {
$('input', $el).addClass('active');
}
// Interrupt .each, only one menu item shall be active
return false;
}
});
}
// Update history when necessary
if (! req.autorefresh && req.addToHistory) {
if (req.$target.hasClass('container')) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
}
} else {
// Request wasn't for a container, so it's usually the body
// or the full layout. Push request URL to history:
var url = typeof req.historyUrl !== 'undefined' ? req.historyUrl : req.url;
this.icinga.history.pushUrl(url);
}
}
req.$target.data('lastUpdate', (new Date()).getTime());
delete this.requests[req.$target.attr('id')];
this.icinga.ui.fadeNotificationsAway();
@ -1028,6 +981,53 @@
return;
}
// Remove 'impact' class if there was such
if (req.$target.hasClass('impact')) {
req.$target.removeClass('impact');
} else {
var $impact = req.$target.find('.impact').first();
if ($impact.length) {
$impact.removeClass('impact');
}
}
if (! req.autorefresh && ! req.autosubmit) {
// TODO: Hook for response/url?
var url = req.url;
if (req.$target[0].id === 'col1') {
this.icinga.behaviors.navigation.trySetActiveAndSelectedByUrl(url);
}
var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]');
var $matches = $.merge($('[href="' + url + '"]'), $forms);
$matches.each(function (idx, el) {
var $el = $(el);
if ($el.closest('#menu').length) {
if ($el.is('form')) {
$('input', $el).addClass('active');
}
// Interrupt .each, only one menu item shall be active
return false;
}
});
}
// Update history when necessary
if (! req.autorefresh && req.addToHistory) {
if (req.$target.hasClass('container')) {
// We only want to care about top-level containers
if (req.$target.parent().closest('.container').length === 0) {
this.icinga.history.pushCurrentState();
}
} else {
// Request wasn't for a container, so it's usually the body
// or the full layout. Push request URL to history:
var url = typeof req.historyUrl !== 'undefined' ? req.historyUrl : req.url;
this.icinga.history.pushUrl(url);
}
}
if (typeof req.loadNext !== 'undefined' && req.loadNext.length) {
if ($('#col2').length) {
var r = this.loadUrl(req.loadNext[0], $('#col2'));