[Mpuls-commits] r810 - in wasko/branches/2.0: . waskaweb/controllers waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-21 17:29:42 +0100 (Thu, 21 Jan 2010)
New Revision: 810

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/controllers/case_overview.py
   wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
Log:
* waskaweb/templates/casemanagement/overview.mako: Remove evalue
bundle action.  It was commented out anyway.

* waskaweb/controllers/case_overview.py
(CaseOverviewController.bundleAction): Remove evaluate action


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:20:26 UTC (rev 809)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:29:42 UTC (rev 810)
@@ -1,6 +1,14 @@
 2010-01-21  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/casemanagement/overview.mako: Remove evalue
+	bundle action.  It was commented out anyway.
+
 	* waskaweb/controllers/case_overview.py
+	(CaseOverviewController.bundleAction): Remove evaluate action
+
+2010-01-21  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/controllers/case_overview.py
 	(CaseOverviewController.listBadCases): Removed.  Not used anywhere.
 
 2010-01-21  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-01-21 16:20:26 UTC (rev 809)
+++ wasko/branches/2.0/waskaweb/controllers/case_overview.py	2010-01-21 16:29:42 UTC (rev 810)
@@ -440,13 +440,6 @@
                 session.save()
                 return self.exportXML(1)
 
-            elif action == 'evaluate':
-                if case_bundle.isEmpty(): return self._emptyListError()
-                session['casebundle'] = case_bundle
-                session['casebundle_for_eval'] = case_bundle
-                session['hide_search_option_on_eval'] = True
-                session.save()
-                redirect_to(controller='evaluate', action="evaluate", id=1);
             elif action == 'check_validity':
                 if case_bundle.isEmpty(): return self._emptyListError()
                 session['casebundle'] = case_bundle

Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako	2010-01-21 16:20:26 UTC (rev 809)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako	2010-01-21 16:29:42 UTC (rev 810)
@@ -41,9 +41,6 @@
       <option value="exportXML">Als XML-Datei exportieren</option>
       <option value="exportCSV">Als CSV-Datei exportieren</option>
       ##<option value="check_validity">Validität überprüfen</option>
-      ##% if not c.hide_evaluation:
-      ##  <option value="evaluate">Auswerten</option>
-      ##% endif
       % endif
     </select>
   </div>