[Mpuls-commits] r1281 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-05 15:53:37 +0100 (Fri, 05 Feb 2010)
New Revision: 1281

Modified:
   wasko/branches/2.0/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-05 14:53:13 UTC (rev 1280)
+++ wasko/branches/2.0/ChangeLog	2010-02-05 14:53:37 UTC (rev 1281)
@@ -20,6 +20,13 @@
 	mapping. Search for controllers in basedir too.
 	* INSTALL: Added notes how to INSTALL the appliction as WASKO instance
 	* README.txt: Deleted note on installation. Refer to INSTALL
+	* waskaweb/templates/main.mako: Do call showSettings controller
+	directly in usersettings instead of  settings method in waska
+	controller
+	* waskaweb/controllers/waska.py (WaskaController.settings): Deleted.
+	Not called anymore.
+	* mpulsweb/config/environment.py (load_environment): Added debugging
+	info on startup about custom controller locations
 
 	Adopt egg configuration
 
@@ -30,6 +37,18 @@
 	  mpulsweb.egg-info/requires.txt: Modified confguraiton of egg.
 	  Adopted template for ini files.
 
+	Copied model.user to base
+
+	* mpulsweb/model/user.py: Copied
+	* waskaweb/model/case.py,
+	  waskaweb/controllers/usersettings.py,
+	  waskaweb/controllers/case_overview.py,
+	  waskaweb/controllers/waska.py,
+	  waskaweb/controllers/case.py,
+	  waskaweb/controllers/administration.py: Import model.user from base
+	  now.
+	* waskaweb/model/user.py: Deleted. Was moved to base now.
+
 2010-02-04  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	Added test dir for the base