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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 16:54:58 +0100 (Wed, 10 Feb 2010)
New Revision: 1471

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


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-10 15:49:41 UTC (rev 1470)
+++ wasko/branches/2.0/ChangeLog	2010-02-10 15:54:58 UTC (rev 1471)
@@ -7,6 +7,27 @@
 
 2010-02-10  Torsten Irländer <torsten.irlaender at intevation.de>
 
+	Moved news to base
+
+	* mpulsweb/model/news.py,
+	  waskaweb/model/news.py: Moved news model to base
+	* waskaweb/controllers/waska.py: Import news model from base 
+	* waskaweb/templates/start/newslist.mako, 
+	  mpulsweb/templates/news,
+	  mpulsweb/templates/news/newslist.mako: Moved template for newslist.
+	* waskaweb/templates/start/start.mako: Include newslist from new
+	  location.
+	* mpulsweb/templates/home/home.mako:  Added news section.
+	* mpulsweb/templates/news/dialogs/confirm_mark_news_as_read.mako,
+	  waskaweb/templates/start/dialogs/confirm_mark_news_as_read.mako:
+	  Moved confirm dialogs to mark news as read.
+	* mpulsweb/controllers/news.py (NewsController.hide): Render confirm
+	  dialog from other location. 
+	* mpulsweb/controllers/news.py (NewsController.index): Deleted. Not
+	  used. 
+
+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,
@@ -52,6 +73,22 @@
 	* waskaweb/controllers/administration.py
 	(AdministrationController.accountDeactivated): Deleted. Is now
 	implemented in mpulsweb.controllers.auth
+	* mpulsweb/controllers/administration.py
+	(AdministrationController.deleteUser): Copied from waskaweb. Removed
+	try/except blocks. Adapted c-vars for dialogs.
+	* mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako, 
+	waskaweb/templates/administration/dialogs/confirm_deleteuser.mako,
+	mpulsweb/templates/administration/dialogs/failed_delete_user.mako,
+	waskaweb/templates/administration/dialogs/failed_delete_user.mako,
+	mpulsweb/templates/administration/dialogs/success_delete_user.mako,
+	waskaweb/templates/administration/dialogs/success_delete_user.mako:
+	Moved template
+	* mpulsweb/controllers/administration.py (user_has_cases): Implemented
+	function to check if the user is the editor of at least one cases
+	* mpulsweb/controllers/mpuls.py (get_newslist): Copied from mpulsbase. 
+	* mpulsweb/controllers/mpuls.py (MpulsController.index): Load news if
+	enabled.
+	* waskaweb/controllers/waska.py (get_newslist): Deleted.  
 
 2010-02-09  Bernhard Herzog  <bh at intevation.de>