[Mpuls-commits] r4948 - in base/trunk: . contrib/apache

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-05-09 16:41:25 +0200 (Mon, 09 May 2011)
New Revision: 4948

Modified:
   base/trunk/ChangeLog
   base/trunk/contrib/apache/mpuls.wsgi
Log:
Fixed missing import. Fixed varible assignment


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-09 13:00:34 UTC (rev 4947)
+++ base/trunk/ChangeLog	2011-05-09 14:41:25 UTC (rev 4948)
@@ -3,6 +3,16 @@
 	* mpulsweb/templates/info/info.mako: Added developers to infopage
 	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po: Issue2107: Fixed
 	translation.
+	* mpulsweb/lib/config.py: Added new config var to define the icon of a
+	phase
+	* mpulsweb/model/phase.py: New: getIcon function. Try to get the
+	configured icon for a phase. If not set fall back into old behavior
+	and return the first lowercase letter of the description (backward
+	compatibility) 
+	* mpulsweb/templates/casemanagement/caselist.mako: Use new getIcon
+	function.
+	* contrib/apache/mpuls.wsgi: Fixed missing import. Fixed varible
+	assignment
 
 2011-05-06  Torsten Irländer <torsten.irlaender at intevation.de>
 

Modified: base/trunk/contrib/apache/mpuls.wsgi
===================================================================
--- base/trunk/contrib/apache/mpuls.wsgi	2011-05-09 13:00:34 UTC (rev 4947)
+++ base/trunk/contrib/apache/mpuls.wsgi	2011-05-09 14:41:25 UTC (rev 4948)
@@ -8,9 +8,10 @@
 
 sys.stdout = sys.stderr
 from paste.deploy import loadapp
+from paste.script.util.logging_config import fileConfig
 from pkg_resources import working_set
 
-TYPE=mpuls
+TYPE="mpuls"
 
 # Set correct app name and conf
 APP_NAME = TYPE + 'web'