[Mpuls-commits] r1984 - wasko/branches/2.0/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-17 10:33:50 +0100 (Wed, 17 Mar 2010)
New Revision: 1984

Modified:
   wasko/branches/2.0/mpulsweb/controllers/case_overview.py
Log:
* mpulsweb/controllers/case_overview.py: Load default search options
from mpulsconfig



Modified: wasko/branches/2.0/mpulsweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case_overview.py	2010-03-17 09:31:05 UTC (rev 1983)
+++ wasko/branches/2.0/mpulsweb/controllers/case_overview.py	2010-03-17 09:33:50 UTC (rev 1984)
@@ -14,23 +14,9 @@
 
 log = logging.getLogger(__name__)
 
-all_phases = [p for p in g.mpuls_config.get('phases', 'phases')]
-all_phases.append("-1")
+FORM_DEFAULTS_ADMIN = g.mpuls_config.get('search', 'admin_defaults')[0]
+FORM_DEFAULTS_CM = g.mpuls_config.get('search', 'cm_defaults')[0]
 
-FORM_DEFAULTS_ADMIN = {
-    'own': '1',
-    'search_str': '',
-    'state': ['3', '4'],
-    'phase': all_phases 
-    }
-
-FORM_DEFAULTS_CM = {
-    'own': '1',
-    'search_str': '',
-    'state': ['1'],
-    'phase': all_phases
-    }
-
 def get_sort(params):
     sort = params.get('sort_field', 'id')
     order = params.get('sort_order', 'asc')