[Erp5-report] r18041 - /erp5/trunk/products/ERP5Form/FormulatorPatch.py

[nobody at svn.erp5.org]

Author: yusei
Date: Wed Dec  5 18:45:54 2007
New Revision: 18041

URL: http://svn.erp5.org?rev=18041&view=rev
Log:
support to search talesfield and methodfield.

Modified:
    erp5/trunk/products/ERP5Form/FormulatorPatch.py

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=18041&r1=18040&r2=18041&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Wed Dec  5 18:45:54 2007
@@ -25,6 +25,8 @@
 from Products.Formulator.Widget import Widget
 from Products.Formulator.Widget import render_element
 from Products.Formulator.FieldRegistry import FieldRegistry
+from Products.Formulator import TALESField
+from Products.Formulator import MethodField
 from ProxyField import ProxyField
 from AccessControl import ClassSecurityInfo
 from cgi import escape
@@ -1467,7 +1469,15 @@
 
 
 # Find support in ZMI. This is useful for development.
+def getSearchSource(obj):
+  obj_type = type(obj)
+  if obj_type is MethodField.Method:
+    return obj.method_name
+  elif obj_type is TALESField.TALESMethod:
+    return obj._text
+  return str(obj)
 def Field_PrincipiaSearchSource(self):
-  return str((self.values.values(), self.tales.values(),
-              self.overrides.values()))
+  return ''.join(
+    map(getSearchSource,
+        (self.values.values()+self.tales.values()+self.overrides.values())))
 Field.PrincipiaSearchSource = Field_PrincipiaSearchSource