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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 17:57:14 +0100 (Tue, 09 Feb 2010)
New Revision: 1429

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-09 16:56:35 UTC (rev 1428)
+++ wasko/branches/2.0/ChangeLog	2010-02-09 16:57:14 UTC (rev 1429)
@@ -89,6 +89,159 @@
 
 2010-02-09  Torsten Irländer <torsten.irlaender at intevation.de>
 
+	Moved administration controller to base
+
+	* mpulsweb/controllers/administration.py: New controller. 
+	* waskaweb/controllers/administration.py: Import base Administration
+	controller from base as BaseAdministrationController. 
+	Inherit AdministrationController in waskaweb from
+	BaseAdministrationController.
+
+	* mpulsweb/templates/administration/overview_user.mako,
+	  waskaweb/templates/administration/overview_user.mako: Moved template
+	  for user overview to base.
+
+	* waskaweb/controllers/administration.py
+	(AdministrationController.overviewUser): Deleted. Is now defined in
+	base controller.
+
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.overviewUserGroups): Moved from waskaweb. 
+	* waskaweb/controllers/administration.py 
+	(AdministrationController.accountDeactivated): Deleted.
+	* mpulsweb/templates/administration/overview_usergroups.mako: Moved
+	from waskaweb
+	* waskaweb/templates/administration/overview_usergroups.mako: Deleted
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.showUser): Moved from waskaweb. 
+	* waskaweb/controllers/administration.py 
+	  (AdministrationController.showUser): Deleted
+	* mpulsweb/templates/administration/show_user.mako: Moved from
+	waskaweb
+	* waskaweb/templates/administration/show_user.mako: Deleted
+	* mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako,
+	  waskaweb/templates/administration/dialogs/success_edit_usergroup.mako:
+	  Moved template.
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.showUserGroup): Copied from waskaweb
+	* mpulsweb/templates/administration/show_usergroup.mako,
+	  waskaweb/templates/administration/show_usergroup.mako: Moved
+	  template
+	* waskaweb/controllers/administration.py 
+	  (AdministrationController.showUserGroup): Deleted 
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.editUserGroup): Copied from waskaweb
+	* mpulsweb/templates/administration/edit_usergroup.mako,
+	  waskaweb/templates/administration/edit_usergroup.mako: Moved
+	  template
+	* waskaweb/controllers/administration.py 
+	  (AdministrationController.editUserGroup): Deleted
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.editUserGroupAction): Copied from
+	  waskaweb. Adapted imports. Fixed dialog vars and removed try except
+	  block.
+	* mpulsweb/lib/validators.py: Moved some Validatore from waskaweb to
+	  base 
+	* waskaweb/lib/validators.py: Deleted moved Validators 
+	* waskaweb/controllers/administration.py
+	  (AdministrationController.editUserGroupAction): Deleted.
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.newUserGroup): Copied from waskaweb.
+	* mpulsweb/templates/administration/new_usergroup.mako,
+	  waskaweb/templates/administration/new_usergroup.mako: Moved template
+	  to base.
+	* waskaweb/controllers/administration.py
+	  (AdministrationController.NewUserGroup): Deleted.
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.newUserGroupAction): Copied from waskaweb.
+	  Removed try/except block. Changed c-vars for dialogs.
+	* mpulsweb/templates/administration/dialogs/success_new_usergroup.mako,
+	  waskaweb/templates/administration/dialogs/success_new_usergroup.mako:
+	  Moved template
+	* mpulsweb/templates/dialogs/failed.mako: Copied from waskaweb.
+	  Adapted c-vars for texts in dialog.
+	* mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako, 
+	  waskaweb/templates/administration/dialogs/failed_new_usergroup.mako:
+	  Moved template.
+	* waskaweb/controllers/administration.py
+	(AdministrationController.createUserGroupAction): Deleted. 
+
+	* mpulsweb/controllers/administration.py 
+	  (AdministrationController.deleteUserGroup): Copied from waskaweb.
+	  Adaped c-vars for dialog.
+	* mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako,
+	  waskaweb/templates/administration/dialogs/success_deletegroup_user.mako:
+	  Moved template to base.
+	* mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako,
+	  waskaweb/templates/administration/dialogs/confirm_deleteusergroup.mako:
+	  Moved template to base.
+	* mpulsweb/templates/administration/dialogs/failed_new_user.mako,
+	  waskaweb/templates/administration/dialogs/failed_new_user.mako:
+	  Moved template to base.
+	* mpulsweb/templates/dialogs/confirm.mako: Copied from waskaweb and
+	  adapted c-vars for dialogtexts
+	* waskaweb/controllers/administration.py
+	(AdministrationController.deleteUserGroup): Deleted.
+
+	* waskaweb/controllers/administration.py 
+	(AdministrationController.viewPrivacyStatement): Deleted. Not called
+	from anywhere. 
+
+	* mpulsweb/controllers/settings.py: New. Copied agencysetting methods
+	from waskaweb administration controller.
+	* mpulsweb/model/agencysettings.py: Copied from waskaweb.
+	* waskaweb/model/appointment.py,
+	  waskaweb/model/case.py,
+	  waskaweb/controllers/administration.py: Import agencysettings model
+	  from base now.
+	* waskaweb/model/agencysettings.py: Deleted.
+	* mpulsweb/templates/settings/dialogs/success_edit.mako,
+	  mpulsweb/templates/settings/show.mako,
+	  mpulsweb/templates/settings/edit.mako: New. Copied templates for
+	  agency settings.
+	* mpulsweb/lib/validators.py (MaxMinInt),(EditSettingsForm): New moved from
+	  waskaweb.valiadtors
+	* waskaweb/lib/validators.py (MaxMinInt),(EditSettingsForm): Deleted 
+	* waskaweb/controllers/administration.py 
+	  (AdministrationController.showSettings),
+	  (AdministrationController.editSettings), 
+	  (AdministrationController.editSettingsAction): Deleted. Are now
+	  impleted under mpulsweb.settings. 
+	* waskaweb/templates/administration/show_settings.mako,
+	  waskaweb/templates/administration/edit_settings.mako,
+	  waskaweb/templates/administration/dialogs/success_edit_agency.mako:
+	  Deleted.
+
+	* waskaweb/templates/administration/settings.mako: Deleted not
+	  rendered anywhere
+
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.newUser): Copied from waskaweb. 
+	* mpulsweb/templates/administration/new_user.mako: Copied from
+	waskaweb 
+	* waskaweb/controllers/administration.py
+	(AdministrationController.newUser): Deleted. Is implemented in
+	mpulsweb now
+	* mpulsweb/lib/validators.py (NewUserForm), (LoginCheck): Copied from
+	  waskaweb
+	* waskaweb/lib/validators.py (NewUserForm): Import from mpulsweb.
+	Deleted implementation
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.newUserAction): Copied from waskaweb.
+	Removed try/except block as we do not want to display traceback
+	* mpulsweb/templates/administration/new_user_result.mako: New. Copied
+	from waskaweb
+	* waskaweb/controllers/administration.py (createUserAction): Deleted.
+	Is now implemented in mpulsweb
+
+2010-02-09  Torsten Irländer <torsten.irlaender at intevation.de>
+
 	Moved usersettings to base.
 
 	* mpulsweb/controllers/usersettings.py: Copied from waskaweb