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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-10-14 16:41:59 +0200 (Fri, 14 Oct 2011)
New Revision: 5474

Modified:
   base/trunk/mpulsweb/controllers/evaluation_overview.py
Log:
Remove support for the AGENCY_OVERVIEW_SELECTION session key.
It's not actually used. It's initialized when the evaluation overview
search is reset and read from the session at one point, but it's always
an empty dictionary.

AGENCY_OVERVIEW_SELECTION was probably introduced when the
evaluation_overview controller was copied from the case_overview
controller which at that time used CASE_OVERVIEW_SEARCHOPTIONS. The
latter has sine been removed from the code base as well, also because it
was not used (revision 4559).


Modified: base/trunk/mpulsweb/controllers/evaluation_overview.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluation_overview.py	2011-10-14 13:27:49 UTC (rev 5473)
+++ base/trunk/mpulsweb/controllers/evaluation_overview.py	2011-10-14 14:41:59 UTC (rev 5474)
@@ -80,7 +80,6 @@
         reset = self._checkBool(request.params.get('reset', '0'))
         if reset:
             session['AGENCY_OVERVIEW_SEARCHOPTIONS'] = {}
-            session['AGENCY_OVERVIEW_SELECTION'] = {}
             session['EXTENDED_SEARCH'] = False
             session.save()
 
@@ -118,7 +117,6 @@
         # Load case-selection and merge with default search options
         # Ok please close your eyes now!!! This is.... well ugly
         search_options_copy = search_options.copy()
-        search_options_copy.update(session.get('AGENCY_OVERVIEW_SELECTION', {}))
 
         # Hide evaluation option if someone did a search for a particular editor
         c.hide_evaluation = False