[icinga-checkins] icinga.org: icinga-web/master: Object label condition for status overall.

git at icinga.org git at icinga.org
Wed Jun 20 08:47:16 CEST 2012


Module: icinga-web
Branch: master
Commit: ef1538089f16360090b9d10fd88f8120394f23a6
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=ef1538089f16360090b9d10fd88f8120394f23a6

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon May  7 16:01:38 2012 +0200

Object label condition for status overall.

Label for all host object was 'service' fixes #2591

---

 app/modules/Cronks/lib/js/Cronks/StatusOverall.js |    6 ++++++
 etc/conf.d/auth.xml                               |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/modules/Cronks/lib/js/Cronks/StatusOverall.js b/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
index 2b0d80d..2aaeb14 100644
--- a/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
+++ b/app/modules/Cronks/lib/js/Cronks/StatusOverall.js
@@ -10,7 +10,13 @@ Ext.ns('Icinga.Cronks.System.StatusOverall');
                 '{count}',
             "</tpl>",
             '<tpl if="state == 100">',
+                '<tpl if="type == \'service\'">',
                 "<span ext:qtip='All problem services / all services '>",
+                '</tpl>',
+                '<tpl if="type == \'host\'">',
+                "<span ext:qtip='All problem hosts / all hosts '>",
+                '</tpl>',
+
                     "{allProblems} / {count}",
                 "</span>",
             "</tpl>",
diff --git a/etc/conf.d/auth.xml b/etc/conf.d/auth.xml
index 71f03a1..f7410a3 100644
--- a/etc/conf.d/auth.xml
+++ b/etc/conf.d/auth.xml
@@ -44,7 +44,7 @@
 			<ae:parameter name="ldap_filter_user"><![CDATA[(&(uid=__USERNAME__))]]></ae:parameter>
 		</ae:parameter>
 	-->
-	</setting>
+   	</setting>
 
 	<setting name="message">
 	<!--
@@ -56,4 +56,4 @@
 	-->
 	</setting>
 	
-</settings>
\ No newline at end of file
+</settings>





More information about the icinga-checkins mailing list