[Erp5-report] r25521 - in /erp5/trunk/bt5: erp5_accounting_ui_test/SkinTemplateItem/portal_...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Feb 10 23:17:02 CET 2009


Author: kazuhiko
Date: Tue Feb 10 23:17:01 2009
New Revision: 25521

URL: http://svn.erp5.org?rev=25521&view=rev
Log:
base_url can be just an absolute url of the portal.

Modified:
    erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
    erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision
    erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
    erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision
    erp5/trunk/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml
    erp5/trunk/bt5/erp5_web_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml [utf8] Tue Feb 10 23:17:01 2009
@@ -42,11 +42,10 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
-            tal:define="base_url  python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId());\n
-                        global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
+            tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="base_url">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr tal:condition="is_selenium_0_8">\n
@@ -68,7 +67,7 @@
     <tal:block tal:condition="init_method">\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string:$base_url/accounting_module/$init_method" />\n
+      <td tal:content="string:$${base_url}/accounting_module/$init_method" />\n
       <td></td>\n
     </tr>\n
     <tr>\n

Modified: erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting_ui_test/bt/revision [utf8] Tue Feb 10 23:17:01 2009
@@ -1,1 +1,1 @@
-116
+117

Modified: erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml [utf8] Tue Feb 10 23:17:01 2009
@@ -42,11 +42,10 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
-            tal:define="base_url  python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId());\n
-                        global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
+            tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="base_url">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr tal:condition="is_selenium_0_8">\n
@@ -88,7 +87,7 @@
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string:$base_url/internal_packing_list_module/$init_method" />\n
+      <td tal:content="string:$${base_url}/internal_packing_list_module/$init_method" />\n
       <td></td>\n
     </tr>\n
     <tr>\n

Modified: erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision [utf8] Tue Feb 10 23:17:01 2009
@@ -1,1 +1,1 @@
-13
+14

Modified: erp5/trunk/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml [utf8] Tue Feb 10 23:17:01 2009
@@ -44,7 +44,7 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python:\'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

Modified: erp5/trunk/bt5/erp5_web_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ui_test/bt/revision?rev=25521&r1=25520&r2=25521&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ui_test/bt/revision [utf8] Tue Feb 10 23:17:01 2009
@@ -1,1 +1,1 @@
-6
+7




More information about the Erp5-report mailing list