[Mpuls-commits] r2863 - base/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-06-03 11:29:18 +0200 (Thu, 03 Jun 2010)
New Revision: 2863

Modified:
   base/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-03 09:28:36 UTC (rev 2862)
+++ base/trunk/ChangeLog	2010-06-03 09:29:18 UTC (rev 2863)
@@ -6,6 +6,11 @@
 	subquery.
 	* mpulsweb/templates/casemanagement/caselist.mako: Fixed showing
 	validity icons in caselist
+	* mpulsweb/model/case.py (MpulsCase.getValidity): Added new function
+	which will return the max valitiy of a case based on set tags.
+	Currently only a dummy function.
+	* mpulsweb/templates/casemanagement/caselist.mako: Ask case object for
+	its validity and show icon.
 
 2010-06-02  Bernhard Herzog  <bh at intevation.de>
 
@@ -47,7 +52,6 @@
 	the default filter in templates, so it's wrong now to do it
 	explicitly.
 
->>>>>>> .r2857
 2010-05-31  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/controllers/caseappointment.py