[Erp5-report] r15182 - /erp5/trunk/products/ERP5Form/

[nobody at svn.erp5.org]

Author: romain
Date: Wed Jul 11 12:11:29 2007
New Revision: 15182

URL: http://svn.erp5.org?rev=15182&view=rev
Log:
Improve compatibility between PlanningBox and ProxyField, in order to surcharge
Javascript configuration.

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

Modified: erp5/trunk/products/ERP5Form/FormulatorPatch.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/FormulatorPatch.py?rev=15182&r1=15181&r2=15182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Wed Jul 11 12:11:29 2007
@@ -461,6 +461,13 @@
   """
   pass
 Widget.render_css = Widget_render_css
+
+def Widget_get_javascript_list(self, field, REQUEST):
+  """
+  Return JS needed by the widget
+  """
+  return []
+Widget.get_javascript_list = Widget_get_javascript_list
 
 from Products.Formulator.Validator import LinesValidator
 
@@ -1262,7 +1269,7 @@
   """
   Returns list of javascript needed by the field
   """
-  return []
+  return self.widget.get_javascript_list(self, REQUEST)
 Field.get_javascript_list = Field_get_javascript_list
 
 

Modified: erp5/trunk/products/ERP5Form/PlanningBox.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PlanningBox.py?rev=15182&r1=15181&r2=15182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PlanningBox.py (original)
+++ erp5/trunk/products/ERP5Form/PlanningBox.py Wed Jul 11 12:11:29 2007
@@ -927,6 +927,19 @@
                   'web browser seem to work differently',
       default=2,
       required=0)
+
+  def get_javascript_list(self, field, REQUEST=None):
+    """
+    Returns list of javascript needed by the widget
+    """
+    if field.get_value('js_enabled'):
+      context = getContext(field, REQUEST)
+      # XXX Instead of harcoding library name
+      # it should be better to call a python script, as
+      # it is done on type base method.
+      return ['%s/wz_dragdrop.js' % context.portal_url.getPortalPath()]
+    else:
+      return []
 
   def render_css(self, field, REQUEST):
     """
@@ -3154,19 +3167,6 @@
   def render_css(self, REQUEST=None):
     return self.widget.render_css(self, REQUEST)
 
-  def get_javascript_list(self, REQUEST=None):
-    """
-    Returns list of javascript needed by the field
-    """
-    if self.get_value('js_enabled'):
-      context = getContext(self, REQUEST)
-      # XXX Instead of harcoding library name
-      # it should be better to call a python script, as
-      # it is done on type base method.
-      return ['%s/wz_dragdrop.js' % context.portal_url.getPortalPath()]
-    else:
-      return []
-
 # XXX Copy paste from listbox
 def getContext(field, REQUEST):
   """

Modified: erp5/trunk/products/ERP5Form/ProxyField.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ProxyField.py?rev=15182&r1=15181&r2=15182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ProxyField.py (original)
+++ erp5/trunk/products/ERP5Form/ProxyField.py Wed Jul 11 12:11:29 2007
@@ -126,6 +126,16 @@
       result = proxy_field.widget.render_css(field, REQUEST)
     return result
 
+  def get_javascript_list(self, field, REQUEST):
+    """
+    Render proxy field
+    """
+    result = []
+    proxy_field = field.getRecursiveTemplateField()
+    if proxy_field is not None:
+      result = proxy_field.widget.get_javascript_list(field, REQUEST)
+    return result
+
 class ProxyValidator(Validator.Validator):
   """
     Validation of entered value through proxy field
@@ -498,14 +508,3 @@
     else:
       result = ZMIField._get_user_input_value(self, key, REQUEST)
     return result
-
-  def get_javascript_list(self, REQUEST=None):
-    """
-    Returns list of javascript needed by the field
-    """
-    proxy_field = self.getTemplateField()
-    if proxy_field is not None:
-      result = proxy_field.get_javascript_list(REQUEST)
-    else:
-      result = ZMIField.get_javascript_list(self, REQUEST)
-    return result