[Mpuls-commits] r4854 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-04-04 12:43:36 +0200 (Mon, 04 Apr 2011)
New Revision: 4854

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/case_overview.py
Log:
Reverted change from rev 4852, 4853


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-04-04 10:20:33 UTC (rev 4853)
+++ base/trunk/ChangeLog	2011-04-04 10:43:36 UTC (rev 4854)
@@ -1,10 +1,3 @@
-2011-04-04  Torsten Irlaender <torsten at intevation.de>
-
-	* mpulsweb/controllers/case_overview.py
-	(CaseOverviewController._renderOverview): Issue1973: Fixed hiding
-	of evaluate option in case-overview.
-	
-
 2011-03-31  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* mpulsweb/model/appointment.py

Modified: base/trunk/mpulsweb/controllers/case_overview.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_overview.py	2011-04-04 10:20:33 UTC (rev 4853)
+++ base/trunk/mpulsweb/controllers/case_overview.py	2011-04-04 10:43:36 UTC (rev 4854)
@@ -57,7 +57,6 @@
     if user.isAdmin():
         return g.mpuls_config.get('search', 'admin_defaults')[0]
     else:
-        print "defaults: %s" % g.mpuls_config.get('search', 'cm_defaults')[0]
         return g.mpuls_config.get('search', 'cm_defaults')[0]
 
 
@@ -132,9 +131,8 @@
 
         # Hide evaluation option if someone did a search for a particular editor
         c.hide_evaluation = False
-        if form_defaults.get('editor'):
-            if str(form_defaults.get('editor')) != '-1':
-                c.hide_evaluation = True
+        if form_defaults.get('editor') != -1:
+            c.hide_evaluation = True
 
         form_defaults["id_field"] = "m.id"
         form_defaults["all_ids"] = " ".join(unicode(case.id)