From 6ec2ee753d2212b1a4c77505a06bfd3d6a846853 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 30 Jan 2015 14:50:25 +0100
Subject: [PATCH] Render error messages in the container itself

fixes #6280
---
 application/controllers/ErrorController.php |  1 +
 application/views/scripts/error/error.phtml |  5 +++--
 public/js/icinga/loader.js                  | 16 +---------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 0548b5c9c..e198eca1c 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -19,6 +19,7 @@ class ErrorController extends ActionController
     {
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
+        $this->getTabs()->showOnlyCloseButton();
 
         Logger::error($exception);
         Logger::error('Stacktrace: %s', $exception->getTraceAsString());
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index 2a900651b..8e61e80f8 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,8 +1,9 @@
-<?php if ($this->title): ?>
 <div class="controls">
+<?= $this->tabs->render($this) ?>
+<?php if ($this->title): ?>
 <h1><?= $this->escape($title) ?></h1>
-</div>
 <?php endif ?>
+</div>
 <div class="content">
 <?php if ($this->message): ?>
   <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 31a0d10a8..95ac5beeb 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -594,18 +594,7 @@
         onFailure: function (req, textStatus, errorThrown) {
             var url = req.url;
 
-            if (req.status === 500) {
-                if (this.exception === null) {
-                    req.$target.addClass('impact');
-
-                    this.exception = this.createNotice(
-                        'error',
-                        $('h1', $(req.responseText)).first().html(),
-                        true
-                    );
-                    this.icinga.ui.fixControls();
-                }
-            } else if (req.status > 0) {
+            if (req.status > 0) {
                 this.icinga.logger.error(
                     req.status,
                     errorThrown + ':',
@@ -617,9 +606,6 @@
                     req.action,
                     req.autorefresh
                 );
-
-                // Header example:
-                // Icinga.debug(req.getResponseHeader('X-Icinga-Redirect'));
             } else {
                 if (errorThrown === 'abort') {
                     this.icinga.logger.debug(