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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 12:27:05 +0100 (Wed, 10 Feb 2010)
New Revision: 1454

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-10 11:26:40 UTC (rev 1453)
+++ wasko/branches/2.0/ChangeLog	2010-02-10 11:27:05 UTC (rev 1454)
@@ -1,3 +1,51 @@
+2010-02-10  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.editUser): Copied from waskaweb
+	* mpulsweb/templates/administration/edit_user.mako,
+	  waskaweb/templates/administration/edit_user.mako: Moved template
+	  file.
+	* waskaweb/controllers/administration.py
+	(AdministrationController.editUser): Deleted. Is not implemented in
+	mpulsweb 
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.resetUserPassword): Copied from waskaweb.
+	Removed try/except block and adapted c-vars for dialogs.
+	* mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako,
+	waskaweb/templates/administration/dialogs/confirm_resetpassword.mako,
+	mpulsweb/templates/administration/reset_password.mako,
+	waskaweb/templates/administration/reset_password.mako:
+	Moved template.
+	* waskaweb/controllers/administration.py
+	(AdministrationController.resetUserPassword):Deleted. Implemented in
+	mpulsweb now. 
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.editUserAction): Copied from waskaweb.
+	Removed try/except block and adapted c-vars for dialogs.
+	* mpulsweb/templates/administration/dialogs/success_edit_user.mako,
+	waskaweb/templates/administration/dialogs/success_edit_user.mako:
+	Moved template
+	* mpulsweb/lib/validators.py (EditUserForm): Copied from waskaweb.
+	* waskaweb/lib/validators.py (EditUserForm): Deleted. Imported from
+	mpulsweb now.
+	* waskaweb/controllers/administration.py
+	(AdministrationController.editUserAction): Deleted. Implemented in
+	mpulsweb now.
+	* waskaweb/controllers/administration.py: Removed unused imports and
+	static vars. Formatting. 
+	* mpulsweb/controllers/auth.py (AuthController.accountDeactivated):
+	Copied from waskaweb.controllers.administration.
+	* mpulsweb/lib/base.py (BaseController.__before__): Call
+	auth/accountDeactivated when account ist deactivated.
+	* mpulsweb/templates/auth/account_deactivated.mako,
+	  waskaweb/templates/administration/account_deactivated.mako: Moved
+	  templates
+	* mpulsweb/lib/base.py (BaseController.__before__): Fixed
+	issue925(wasko) redirecting the user to an infopage if the account is deactivated.
+	* waskaweb/controllers/administration.py
+	(AdministrationController.accountDeactivated): Deleted. Is now
+	implemented in mpulsweb.controllers.auth
+
 2010-02-09  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/base.py: Explicitly list all exported names in