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

[nobody at svn.erp5.org]

Author: jm
Date: Fri Aug 22 16:10:45 2008
New Revision: 23117

URL: http://svn.erp5.org?rev=23117&view=rev
Log:
* SingleItemsWidget should have at least one child in order to produce valid XHTML (similar fix than commit 23074 by Ivan).
* MultiItemsWidget: few style changes (missing comma, spaces at EOL...) and check the number of children sooner.

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=23117&r1=23116&r2=23117&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/FormulatorPatch.py (original)
+++ erp5/trunk/products/ERP5Form/FormulatorPatch.py Fri Aug 22 16:10:45 2008
@@ -614,6 +614,10 @@
   # get items
   cell = getattr(REQUEST, 'cell', None)
   items = field.get_value('items', REQUEST=REQUEST, cell=cell)
+  if not items:
+    # single item widget should have at least one child in order to produce
+    # valid XHTML; disable it so user can not select it
+    return [self.render_item('', '', '', '', 'disabled="disabled"')]
 
   # check if we want to select first item
   if not value and field.get_value('first_item',
@@ -709,15 +713,15 @@
   selected_found = {}
 
   items = field.get_value('items',REQUEST=REQUEST, cell=getattr(REQUEST,'cell',None)) # Added request
+  if not items:
+    # multi items widget should have at least one child in order to produce
+    # valid XHTML; disable it so user can not select it
+    return [self.render_item('', '', '', '', 'disabled="disabled"')]
+
   css_class = field.get_value('css_class')
   extra_item = field.get_value('extra_item')
   rendered_items = []
-  
-  # multi items widget should have at least one child in order to produce 
-  # valid XHTML disable it so user can not select it
-  if not len(items) :
-    return [self.render_item('','', '', '', 'disabled="disabled"')]
- 
+
   for item in items:
       try:
           item_text, item_value = item