[Mpuls-commits] r99 - in waska/trunk: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-08-28 11:35:11 +0200 (Thu, 28 Aug 2008)
New Revision: 99

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/needed.py
Log:
Phases: Handle the case that a data base field has no default value correctly.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-08-28 09:16:24 UTC (rev 98)
+++ waska/trunk/ChangeLog.txt	2008-08-28 09:35:11 UTC (rev 99)
@@ -1,5 +1,10 @@
 2008-08-28  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
+	* waskaweb/lib/needed.py: Handle the case that a data base field 
+	  has no default value correctly.
+
+2008-08-28  Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
 	* waskaweb/lib/needed.py: recognize comma separated phases.
 
 2008-08-28  Sascha L. Teichmann <sascha.teichmann at intevation.de>

Modified: waska/trunk/waskaweb/lib/needed.py
===================================================================
--- waska/trunk/waskaweb/lib/needed.py	2008-08-28 09:16:24 UTC (rev 98)
+++ waska/trunk/waskaweb/lib/needed.py	2008-08-28 09:35:11 UTC (rev 99)
@@ -32,7 +32,8 @@
 
 IS_FILLED = \
 """(%(name)s IS NOT NULL
-    AND %(name)s != get_default_value('master_tbl', '%(name)s'))
+    AND (get_default_value('master_tbl', '%(name)s') IS NULL
+        OR %(name)s != get_default_value('master_tbl', '%(name)s')))
 """
 
 SELECT = \