2008-03-17 Yusei

* Fixed wrong url on virtual host environment.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19969 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffUrl.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -71,10 +68,12 @@
             <value> <string encoding="cdata"><![CDATA[
 
 if brain.object_state == \'Modified\':\n
+  target_object = brain.getObject()\n
+  parent_absolute_path = target_object.aq_parent.absolute_url()\n
   if hasattr(brain, \'bt1\'):\n
-    return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class+\'&bt1=\'+brain.bt1+\'&bt2=\'+brain.bt2\n
+    return parent_absolute_path+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class+\'&bt1=\'+brain.bt1+\'&bt2=\'+brain.bt2\n
   else:\n
-    return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class\n
+    return parent_absolute_path+\'/BusinessTemplate_viewObjectsDiff?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class\n
 else:\n
   return None\n
 
@@ -131,8 +130,9 @@ else:\n
                             <string>selection</string>
                             <string>selection_name</string>
                             <string>_getattr_</string>
+                            <string>target_object</string>
+                            <string>parent_absolute_path</string>
                             <string>hasattr</string>
-                            <string>_getitem_</string>
                             <string>None</string>
                           </tuple>
                         </value>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_getTrashObjectUrl.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -68,7 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return \'/\'.join(brain.getPhysicalPath()[4:])+\'/manage_workspace\'\n
+            <value> <string>return brain.absolute_url()+\'/manage_workspace\'\n
 </string> </value>
         </item>
         <item>
@@ -91,7 +88,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>brain, selection</string> </value>
+            <value> <string>brain, selection, selection_name</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -111,7 +108,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -119,8 +116,8 @@
                           <tuple>
                             <string>brain</string>
                             <string>selection</string>
+                            <string>selection_name</string>
                             <string>_getattr_</string>
-                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject/listbox_url.xml

@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -268,18 +265,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: \'/\'.join(cell.getPhysicalPath()[4:])</string> </value>
+            <value> <string>python:\'/\'.join(context.portal_url.getRelativeContentPath(cell)[2:])</string> </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_core/bt/change_log

 2008-03-17 Yusei
 * erp5_core provides general good set of content type registry by default, until we have to handle content type registry seriously.
+* Fixed wrong url on virtual host environment.
 
 2008-03-14 Yusei
 * Remove portal_contributions. erp5_ingestion will provides the tool.

product/ERP5/bootstrap/erp5_core/bt/revision

-748
\ No newline at end of file
+749
\ No newline at end of file