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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-04-04 12:20:13 +0200 (Mon, 04 Apr 2011)
New Revision: 4852

Modified:
   base/trunk/mpulsweb/controllers/case_overview.py
Log:
Issue1973: Fixed hiding of evaluate option in case-overview.


Modified: base/trunk/mpulsweb/controllers/case_overview.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_overview.py	2011-04-01 10:07:29 UTC (rev 4851)
+++ base/trunk/mpulsweb/controllers/case_overview.py	2011-04-04 10:20:13 UTC (rev 4852)
@@ -57,6 +57,7 @@
     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]
 
 
@@ -131,8 +132,9 @@
 
         # Hide evaluation option if someone did a search for a particular editor
         c.hide_evaluation = False
-        if form_defaults.get('editor') != -1:
-            c.hide_evaluation = True
+        if form_defaults.get('editor'):
+            if str(form_defaults.get('editor')) != '-1':
+                c.hide_evaluation = True
 
         form_defaults["id_field"] = "m.id"
         form_defaults["all_ids"] = " ".join(unicode(case.id)