[Erp5-report] r22582 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jul 21 12:06:30 CEST 2008


Author: jerome
Date: Mon Jul 21 12:06:28 2008
New Revision: 22582

URL: http://svn.erp5.org?rev=22582&view=rev
Log:
Some fields, such as LabelFields does not have an "alternate_name" value. Use
field.has_value to check if the field supports alternate_name before getting
the value.


Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml?rev=22582&r1=22581&r2=22582&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml Mon Jul 21 12:06:28 2008
@@ -212,7 +212,9 @@
    Parse given form field, to put them in\n
    kw or in encapsulated_editor_list\n
   """\n
-  k = f.get_value(\'alternate_name\') or f.id\n
+  k = f.id\n
+  if f.has_value(\'alternate_name\'):\n
+    k = f.get_value(\'alternate_name\')\n
   v = getattr(request, k, MARKER)\n
   if hasattr(v, \'edit\'):\n
     # This is an encapsulated editor\n
@@ -409,6 +411,12 @@
             <value> <string>Base_edit</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=22582&r1=22581&r2=22582&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Mon Jul 21 12:06:28 2008
@@ -1,1 +1,1 @@
-907
+908




More information about the Erp5-report mailing list