Minor changes and code styling

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Product_getRelatedDescription.xml

@@ -71,12 +71,13 @@
   - rename to use asHTML terminology\n
 """\n
 portal = context.getPortalObject()\n
+category_path = \'portal_categories/publication_section/website/product/short_description\'\n
 \n
 # Find a related web page with appropriate publication_section\n
 web_page = portal.portal_catalog(portal_type=\'Web Page\',\n
-                                 default_follow_up_uid=context.getUid(),\n
-                                 default_publication_section_uid=context.restrictedTraverse(\'portal_categories/publication_section/website/product/short_description\').getUid(), # XXX Bad hardcoding\n
-                                 )\n
+                        default_follow_up_uid=context.getUid(),\n
+                        default_publication_section_uid=context.restrictedTraverse(category_path).getUid(), # XXX Bad hardcoding\n
+                    )\n
 if web_page is None or len(web_page) == 0:\n
   return context.Base_translateString("No more information for this product.")\n
 return web_page[0].getObject().asStrippedHTML()\n

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_getShopUrl.xml

@@ -50,7 +50,19 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return \'%s/%s\' % (context.getAbsoluteUrl(), \'Resource_viewAsShop\')\n
+            <value> <string>"""\n
+Return a URL for the product to display. If a default display\n
+varition was defined by side effect, take it into account.\n
+\n
+TODO:\n
+- make generic implementation of variation selection\n
+"""\n
+\n
+variation = context.REQUEST.get(\'default_displayed_variation\', None)\n
+if not variation:\n
+  return \'%s/%s\' % (context.getAbsoluteUrl(), \'Resource_viewAsShop\')\n
+\n
+return \'%s/%s?variation=%s\' % (context.getAbsoluteUrl(), \'Resource_viewAsShop\', variation)\n
 </string> </value>
         </item>
         <item>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSection_viewCreditCardPayment/submit.xml

@@ -142,10 +142,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -158,10 +155,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>