[Mpuls-commits] r5007 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-05-25 13:13:59 +0200 (Wed, 25 May 2011)
New Revision: 5007

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/case_bundle.py
Log:
Issue655 added a warning text to the delete case dialog of the admin.
The admin should be sure that he deletes from the server.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-25 10:36:48 UTC (rev 5006)
+++ base/trunk/ChangeLog	2011-05-25 11:13:59 UTC (rev 5007)
@@ -1,5 +1,11 @@
 2011-05-25  Ludwig Reiter <ludwig.reiter at inteation.de>
 
+	* mpulsweb/controllers/case_bundle.py:
+	Issue655: added a warning text to the delete case dialog of the admin.
+	The admin should be sure that he deletes from the server.
+
+2011-05-25  Ludwig Reiter <ludwig.reiter at inteation.de>
+
 	* mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako,
 	mpulsweb/templates/phase/dialogs/success_set_phase.mako:
 	Issue1529: After setting of a new phase the case navigation should be

Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py	2011-05-25 10:36:48 UTC (rev 5006)
+++ base/trunk/mpulsweb/controllers/case_bundle.py	2011-05-25 11:13:59 UTC (rev 5007)
@@ -326,7 +326,12 @@
                                        'Do you really want to delete the'
                                        ' following cases?%s',
                                        len(case_bundle.getCases()))
-                             % "\n".join(self._buildCaseList(case_bundle)))
+                             % "\n".join(self._buildCaseList(case_bundle))) \
+            + _("""Warning! On deleting the case all data will be erased
+irrecoverable!<br>Only delete the case if this case is <b>not needed for
+evaluations</b> anymore.<br><br>Do you want to delete the case from the
+server?""") + "<br><br>"
+   
             c.url_yes = url_for(controller='/case_bundle', action='delete',
                                 confirmed=1)
             c.url_no = url_for(controller='/case_overview')