[icinga-checkins] icinga.org: icinga-web/next: Reporting: Fix interpretion of DateTime fields

git at icinga.org git at icinga.org
Wed Apr 17 17:04:29 CEST 2013


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

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Apr 17 17:00:25 2013 +0200

Reporting: Fix interpretion of DateTime fields

DateTime fields were recognized by the type of the input control
thats wrong, because InputType 2 can be any single value.

Moving back to data type assignment.

fixes #3977

---

 app/modules/Reporting/config/module.xml.in |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/modules/Reporting/config/module.xml.in b/app/modules/Reporting/config/module.xml.in
index 0deaf1d..39c0bc3 100644
--- a/app/modules/Reporting/config/module.xml.in
+++ b/app/modules/Reporting/config/module.xml.in
@@ -115,22 +115,23 @@
                 
                 <!-- Mapping for datatypes e.g. 4 == Date -->
                 <setting name="parameter.mapping.type">
-                </setting>
-                
-                <!-- 
-                    Mapping for inputcontrol types:
-                      * 3 = Date
-                      * 2 = List of values
-                -->
-                <setting name="parameter.mapping.control">
-                    <ae:parameter name="2">
+                    <ae:parameter name="4">
                         <ae:parameter name="className">Icinga.Reporting.inputControl.DateField</ae:parameter>
                         <ae:parameter name="format">Y-m-d H:i:s</ae:parameter>
                         <ae:parameter name="setToNow">true</ae:parameter>
                         <ae:parameter name="allowBlank">true</ae:parameter>
                         <!-- H:i:s -->
                     </ae:parameter>
-                    
+                </setting>
+
+                <!--
+                    Mapping for inputcontrol types:
+                      * 1 = Boolean
+                      * 2 = Single Value (Text)
+                      * 3 = List of values
+                      * ...more
+                -->
+                <setting name="parameter.mapping.control">
                     <ae:parameter name="3">
                         <ae:parameter name="className">Icinga.Reporting.inputControl.ResourceList</ae:parameter>
                     </ae:parameter>





More information about the icinga-checkins mailing list