[Erp5-report] r16459 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...

[nobody at svn.erp5.org]

Author: romain
Date: Tue Sep 18 15:58:33 2007
New Revision: 16459

URL: http://svn.erp5.org?rev=16459&view=rev
Log:
Fix incompatibility with proxyfield.

Modified:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml
    erp5/trunk/bt5/erp5_item/bt/revision

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml?rev=16459&r1=16458&r2=16459&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceTitle.xml Tue Sep 18 15:58:33 2007
@@ -75,9 +75,11 @@
 \n
 # movement list should not be empty, as Item should always be created\n
 # from movement\n
-last_movement = movement_list[0]\n
-resource_uid = last_movement.resource_uid\n
-return context.portal_catalog(uid=resource_uid)[0].title\n
+# But, if it raises an error, ProxyField may be broken\n
+if len(movement_list) == 1:\n
+  last_movement = movement_list[0]\n
+  resource_uid = last_movement.resource_uid\n
+  return context.portal_catalog(uid=resource_uid)[0].title\n
 </string> </value>
         </item>
         <item>
@@ -124,6 +126,7 @@
                             <string>context</string>
                             <string>DateTime</string>
                             <string>movement_list</string>
+                            <string>len</string>
                             <string>_getitem_</string>
                             <string>last_movement</string>
                             <string>resource_uid</string>

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml?rev=16459&r1=16458&r2=16459&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewFieldLibrary/my_resource_title.xml Tue Sep 18 15:58:33 2007
@@ -17,9 +17,9 @@
             <value>
               <list>
                 <string>title</string>
+                <string>default</string>
+                <string>display_width</string>
                 <string>editable</string>
-                <string>display_width</string>
-                <string>default</string>
               </list>
             </value>
         </item>
@@ -68,6 +68,14 @@
                     </value>
                 </item>
                 <item>
+                    <key>                 <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key>                 <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
                 </item>
@@ -79,6 +87,10 @@
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key>                 <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -87,11 +99,15 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>display_width</string> </key>
+                    <key>                 <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
-                    <key>                 <string>editable</string> </key>
+                    <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
@@ -107,7 +123,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Resource</string> </value>
                 </item>
               </dictionary>

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=16459&r1=16458&r2=16459&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision Tue Sep 18 15:58:33 2007
@@ -1,1 +1,1 @@
-22
+23