[Mpuls-commits] r5492 - base/trunk/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-10-21 15:40:48 +0200 (Fri, 21 Oct 2011)
New Revision: 5492

Modified:
   base/trunk/mpulsweb/controllers/case_bundle.py
Log:
Issue 395: In case_bundle the _buildCaseList can now still be overwritten by
the special parts.


Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py	2011-10-21 13:26:51 UTC (rev 5491)
+++ base/trunk/mpulsweb/controllers/case_bundle.py	2011-10-21 13:40:48 UTC (rev 5492)
@@ -229,6 +229,10 @@
                 filtered.append(case.id)
         return MpulsCaseBundle(filtered)
 
+    def _buildCaseList(self, case_bundle):
+        case_list = case_bundle.getCases()
+        return buildCaseList(case_list)
+
     def _build_casebundle(self, options):
         if options.get('all_cases') > 0:
             ids = options["all_ids"]
@@ -286,7 +290,7 @@
                                        'Do you really want to delete the'
                                        ' following cases?%s',
                                        len(case_bundle.getCases()))
-                             % "\n".join(buildCaseList(case_bundle.getCases())))
+                             % "\n".join(self._buildCaseList(case_bundle)))
             c.url_yes = url_for(controller='/case_bundle', action='markDelete',
                                 confirmed=1)
             c.url_no = url_for(controller='/case_overview')
@@ -307,7 +311,7 @@
                                        'Do you really want to delete the'
                                        ' following cases?%s',
                                        total)
-                             % "\n".join(buildCaseList(case_bundle.getCases()))
+                             % "\n".join(self._buildCaseList(case_bundle))
                              + _("Warning!"
                                  " Deleting cases will erase all data of the"
                                  " case irrecoverably!<br>\n"
@@ -383,7 +387,7 @@
                           u" the administrators for review for the definite"
                           u" anonymisation.%s",
                           total)
-                % "\n".join(buildCaseList(case_bundle.getCases())))
+                % "\n".join(self._buildCaseList(case_bundle)))
             c.url_yes = url_for(controller='/case_bundle',
                                 action='markAnonymize', confirmed=1)
             c.url_no = url_for(controller='/case_overview')
@@ -462,7 +466,7 @@
                           u" The anonymised cases will still be considered"
                           u" in the analysis.%s",
                           total)
-                % "\n".join(buildCaseList(case_bundle.getCases())))
+                % "\n".join(self._buildCaseList(case_bundle)))
             c.url_yes = url_for(controller='/case_bundle', action='anonymize',
                                 confirmed=1)
             c.url_no = url_for(controller='/case_overview')
@@ -539,7 +543,7 @@
                           u'Do you really want to restore the following cases?'
                           u' They will be available again for editing.%s',
                           len(case_bundle.getCases()))
-                % "\n".join(buildCaseList(case_bundle.getCases())))
+                % "\n".join(self._buildCaseList(case_bundle)))
             c.url_yes = url_for(controller='/case_bundle', action='restore',
                                 confirmed=1)
             c.url_no = url_for(controller='/case_overview')
@@ -612,7 +616,7 @@
                 'exportselection': [i.getName() for i in c.pages]}
         c.dialog_title = ungettext(u'Export case?', u'Export cases?',
                                    len(case_bundle.getCases()))
-        c.dialog_text = "\n".join(buildCaseList(case_bundle.getCases()))
+        c.dialog_text = "\n".join(self._buildCaseList(case_bundle))
         # logbook export is only possible for XML exports and if the
         # logbook is actually activated in the application.
         c.allow_logbook_export = (g.mpuls_config.is_enabled('case-module',