[Mpuls-commits] r1967 - in wasko/branches/2.0: . jmdweb/controllers mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-16 11:52:56 +0100 (Tue, 16 Mar 2010)
New Revision: 1967

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/controllers/case_overview.py
   wasko/branches/2.0/mpulsweb/controllers/case_overview.py
Log:
Moved some parts of the case_overview controller into mpulsbase.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-03-16 10:51:38 UTC (rev 1966)
+++ wasko/branches/2.0/ChangeLog	2010-03-16 10:52:56 UTC (rev 1967)
@@ -14,6 +14,10 @@
 	mpulsbase 
 	* jmdweb/lib/validators.py: Removed EvaluationFormValidator.
 	* mpulsweb/lib/validators.py: Added EvaluationFormValidator.
+	* mpulsweb/lib/search.py: New.
+	* mpulsweb/controllers/case_overview.py (CaseOverviewController): New.
+	* jmdweb/controllers/case_overview.py (CaseOverviewController):
+	  Inherit from mpulsbase.
 
 2010-03-15  Torsten Irländer <torsten.irlaender at intevation.de>
 

Modified: wasko/branches/2.0/jmdweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/case_overview.py	2010-03-16 10:51:38 UTC (rev 1966)
+++ wasko/branches/2.0/jmdweb/controllers/case_overview.py	2010-03-16 10:52:56 UTC (rev 1967)
@@ -277,20 +277,20 @@
 
 class CaseOverviewController(CaseBaseOverviewController):
 
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
-    def index(self):
-        return self.overview()
+    #@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    #def index(self):
+    #    return self.overview()
 
-    @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
-    def overview_extended(self):
-        extended = session.get('EXTENDED_SEARCH')
-        if extended is not None:
-            extended = not extended
-        else:
-            extended = True
-        session['EXTENDED_SEARCH'] = extended
-        session.save()
-        return self.overview()
+    #@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
+    #def overview_extended(self):
+    #    extended = session.get('EXTENDED_SEARCH')
+    #    if extended is not None:
+    #        extended = not extended
+    #    else:
+    #        extended = True
+    #    session['EXTENDED_SEARCH'] = extended
+    #    session.save()
+    #    return self.overview()
 
     @checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
     def overview(self):

Modified: wasko/branches/2.0/mpulsweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case_overview.py	2010-03-16 10:51:38 UTC (rev 1966)
+++ wasko/branches/2.0/mpulsweb/controllers/case_overview.py	2010-03-16 10:52:56 UTC (rev 1967)
@@ -1,8 +1,26 @@
 # -*- coding: utf-8 -*-
+import logging
 
-from mpulsweb.lib.base import BaseController
+from mpulsweb.lib.base import c, h, render, request, session, BaseController
+from mpulsweb.lib.security import checkRole
 
+log = logging.getLogger(__name__)
+
 class CaseOverviewController(BaseController):
-    pass
 
+    @checkRole(('admin', 'cm', 'pt_dlr'))
+    def index(self):
+        return self.overview()
+
+    @checkRole(('admin', 'cm', 'pt_dlr'))
+    def overview_extended(self):
+        extended = session.get('EXTENDED_SEARCH')
+        if extended is not None:
+            extended = not extended
+        else:
+            extended = True
+        session['EXTENDED_SEARCH'] = extended
+        session.save()
+        return self.overview()
+
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8: