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

Responses with not output (container: ignore) must of course be handled in JS

This commit is contained in:
Thomas Gelf 2014-03-08 12:07:49 +01:00
parent 0fe493b007
commit 71aea4dfc7
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,10 +255,22 @@
active = $('[href].active', req.$target).attr('href');
}
var notifications = req.getResponseHeader('X-Icinga-Notification');
if (notifications) {
var parts = notifications.split(' ');
this.createNotice(
parts.shift(),
parts.join(' ')
);
}
//
var target = req.getResponseHeader('X-Icinga-Container');
var newBody = false;
if (target) {
if (target === 'ignore') {
return;
}
req.$target = $('#' + target);
newBody = true;
}
@ -288,15 +300,6 @@
this.icinga.ui.setWindowId(windowId);
}
var notifications = req.getResponseHeader('X-Icinga-Notification');
if (notifications) {
var parts = notifications.split(' ');
this.createNotice(
parts.shift(),
parts.join(' ')
);
}
// Remove 'impact' class if there was such
if (req.$target.hasClass('impact')) {
req.$target.removeClass('impact');
@ -438,9 +441,11 @@
if (persist) {
c += ' persist';
}
return $(
var $notice = $(
'<li class="' + c + '">' + message + '</li>'
).appendTo($('#notifications'));
this.icinga.ui.fixControls();
return $notice;
},
/**