[Mpuls-commits] r1820 - in wasko/branches/2.0: . mpulsweb/templates/casemanagement/dialogs waskaweb/templates/casemanagement/dialogs

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-25 18:09:45 +0100 (Thu, 25 Feb 2010)
New Revision: 1820

Added:
   wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
   wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
Removed:
   wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/confirm_delete.mako
   wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_delete.mako
Modified:
   wasko/branches/2.0/ChangeLog
Log:
Moved some templates


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-25 17:06:54 UTC (rev 1819)
+++ wasko/branches/2.0/ChangeLog	2010-02-25 17:09:45 UTC (rev 1820)
@@ -28,6 +28,11 @@
 	  mpulsweb/templates/phase/dialogs/success_set_phase.mako: Adapted
 	  links to new controller structure. And moved template into mpulsbase.
 	* mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako: 
+	* mpulsweb/controllers/case.py
+	(CaseController.markForAnonymizeFromOverview): Copied from jmdweb. 
+	* jmdweb/controllers/case.py
+	(CaseController.markForAnonymizeFromOverview): Deleted. Implemented in
+	mpulsbase now.
 
 	* mpulsweb/controllers/phase.py: Enabled setting phase and deleted old
 	  code.
@@ -88,6 +93,17 @@
 	* jmdweb/controllers/case.py (CaseController.anonymize): Deleted. Is
 	implemented in mpulsbase now.  
 
+	* mpulsweb/controllers/case.py (CaseController.delete), 
+	  mpulsweb/controllers/case.py (CaseController.markFordelete): Copied
+	  from jmdweb. Did some cleanup.
+	* waskaweb/controllers/case.py (CaseController.delete), 
+	  waskaweb/controllers/case.py (CaseController.markFordelete): Deleted 
+	  Is now implemented in mpulsbase.
+	* mpulsweb/controllers/case.py (CaseController.reset): Copied from
+	  jmdweb. Did some cleanup. 
+	* jmdweb/controllers/case.py (CaseController.reset): Deleted. Is
+	  implemented in mpulsweb now. 
+
 2010-02-24  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/renderer.py (ErrorRenderer.render_items): New

Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako (from rev 1805, wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/confirm_delete.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete.mako (from rev 1805, wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_delete.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/confirm_delete.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/confirm_delete.mako	2010-02-25 17:06:54 UTC (rev 1819)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/confirm_delete.mako	2010-02-25 17:09:45 UTC (rev 1820)
@@ -1,8 +0,0 @@
-## -*- coding: utf-8 -*- 
-<%inherit file="../../main.mako" />
-<%def name="buildNavipath()">
-	${parent.buildNavipath()}
-	<li><a href="/case/">${_('cm_np_root')}</a></li>
-	<li><a href="#">${_('cm_np_delete')}</a></li>
-</%def>
-<%include file="../../dialogs/confirm.mako" />

Deleted: wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_delete.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_delete.mako	2010-02-25 17:06:54 UTC (rev 1819)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_delete.mako	2010-02-25 17:09:45 UTC (rev 1820)
@@ -1,8 +0,0 @@
-## -*- coding: utf-8 -*- 
-<%inherit file="/main.mako" />
-<%def name="buildNavipath()">
-	${parent.buildNavipath()}
-        <li><a href="/case">${_('cm_np_root')}</a></li>
-	<li><a href="#">${_('cm_np_delete_success')}</a></li>
-</%def>
-<%include file="../../dialogs/success.mako" />