[icinga-checkins] icinga.org: icinga-web/feature/datapermissions-wip: Fix servicegroup credential in views

git at icinga.org git at icinga.org
Tue Feb 19 17:23:59 CET 2013


Module: icinga-web
Branch: feature/datapermissions-wip
Commit: 8958d312cb2dcf25d06b9f3268300fc1aa58dea5
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=8958d312cb2dcf25d06b9f3268300fc1aa58dea5

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Feb 19 14:19:09 2013 +0100

Fix servicegroup credential in views

---

 app/modules/Api/config/views/histories.xml |    2 +-
 app/modules/Api/config/views/host.xml      |    2 +-
 app/modules/Api/config/views/misc.xml      |    4 ++--
 app/modules/Api/config/views/overview.xml  |    4 ++--
 app/modules/Api/config/views/service.xml   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/modules/Api/config/views/histories.xml b/app/modules/Api/config/views/histories.xml
index 90aa28c..bcc1acc 100644
--- a/app/modules/Api/config/views/histories.xml
+++ b/app/modules/Api/config/views/histories.xml
@@ -105,7 +105,7 @@
                 <parameter name="column">os.name2</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <innerjoin>s.servicegroups sg</innerjoin>
                 <innerjoin>sg.object osg</innerjoin>
 
diff --git a/app/modules/Api/config/views/host.xml b/app/modules/Api/config/views/host.xml
index 20206e1..3ee081c 100644
--- a/app/modules/Api/config/views/host.xml
+++ b/app/modules/Api/config/views/host.xml
@@ -256,7 +256,7 @@
                 <parameter name="ornull">true</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <leftjoin>s.servicegroups sg</leftjoin>
                 <leftjoin>sg.object osg</leftjoin>
 
diff --git a/app/modules/Api/config/views/misc.xml b/app/modules/Api/config/views/misc.xml
index 3801215..a178bf7 100644
--- a/app/modules/Api/config/views/misc.xml
+++ b/app/modules/Api/config/views/misc.xml
@@ -82,7 +82,7 @@
                 <parameter name="ornull">true</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <leftjoin>s.servicegroups sg</leftjoin>
                 <leftjoin>sg.object osg</leftjoin>
 
@@ -206,7 +206,7 @@
                 <parameter name="ornull">true</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <leftjoin>s.servicegroups sg</leftjoin>
                 <leftjoin>sg.object osg</leftjoin>
 
diff --git a/app/modules/Api/config/views/overview.xml b/app/modules/Api/config/views/overview.xml
index d716ba7..286437b 100644
--- a/app/modules/Api/config/views/overview.xml
+++ b/app/modules/Api/config/views/overview.xml
@@ -99,7 +99,7 @@
                 <parameter name="column">x.display_name</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <innerjoin>x.servicegroups sg</innerjoin>
                 <innerjoin>sg.object osg</innerjoin>
 
@@ -196,7 +196,7 @@
             </credential>
 
             <!-- TODO: credentials testing -->
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <innerjoin>s.servicegroups sg</innerjoin>
                 <innerjoin>sg.object osg</innerjoin>
 
diff --git a/app/modules/Api/config/views/service.xml b/app/modules/Api/config/views/service.xml
index 0efff61..4915cbe 100644
--- a/app/modules/Api/config/views/service.xml
+++ b/app/modules/Api/config/views/service.xml
@@ -64,7 +64,7 @@
                 <parameter name="column">os.name2</parameter>
             </credential>
 
-            <credential name="IcingaServiceGroup" type="dql">
+            <credential name="IcingaServicegroup" type="dql">
                 <innerjoin>s.servicegroups sg</innerjoin>
                 <innerjoin>sg.object osg</innerjoin>
 





More information about the icinga-checkins mailing list