diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml index 83734d04dcb0b2bef212d97fcd2f96abbfb8a5ba..e98a56ff209b97c2ebef4de8c2d9c2f31bb12f05 100644 --- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml +++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml @@ -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() > \'Zelenium-0.8\'">\n + tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'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 diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision index d2c5ed2124821b21d11dcc57f6a116ed29593583..1bda760653e918fc4fca9a02b046236b0aa02843 100644 --- a/bt5/erp5_accounting_ui_test/bt/revision +++ b/bt5/erp5_accounting_ui_test/bt/revision @@ -1 +1 @@ -116 \ No newline at end of file +117 \ No newline at end of file diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml index 394537a651c6a0d5146b2eda2c4b4c2f0da3c818..8fa5ad61cf3d245347050b0767625ec84fa36659 100644 --- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml +++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml @@ -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() > \'Zelenium-0.8\'">\n + tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'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 diff --git a/bt5/erp5_pdm_ui_test/bt/revision b/bt5/erp5_pdm_ui_test/bt/revision index ca7bf83ac53a27a2a914bed25e1a07478dd8ef47..da2d3988d7d1a255376770b1e87394ebb42febb3 100644 --- a/bt5/erp5_pdm_ui_test/bt/revision +++ b/bt5/erp5_pdm_ui_test/bt/revision @@ -1 +1 @@ -13 \ No newline at end of file +14 \ No newline at end of file diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml index 0145b9a9f15bc5fe5d381693f7e984e1c56c59be..f5c1b907aeb90681fe6ddc5e82df1306caac91fb 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml @@ -61,12 +61,12 @@ <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 <td>open</td>\n - <td tal:content="string: ${here/portal_url}/foo_module/BTZuite_reset"/>\n + <td>${base_url}/foo_module/BTZuite_reset</td>\n <td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml index 2ebded4841fcf40faebf80ecb0f0c48158bf1b65..4de77151e3f56ebbc9e04479393ced94d7b0a214 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml @@ -58,11 +58,10 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n -\n <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 diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml index d815d2660a3beb9a02145389d24b7eec3f12f964..8f3bbb2149c2f9e9a17b67108c7d98ec8f710335 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml @@ -61,7 +61,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 diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml index 0bde2612fc6c8eb5a9d3491e3e0763437fa771c6..2eda4e9719c056525ba250559e46dcabe46969ba 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml @@ -61,7 +61,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 diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml index 2560beb8815c4d3244376cbb3f80aa1e71786396..9d609e181868064ba943a6a35f026877d8718abe 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml @@ -62,12 +62,12 @@ <!-- reuse listbox suite reset to clear modules. -->\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 <td>open</td>\n - <td tal:content="string: ${here/portal_url}/foo_module/ListBoxZuite_reset"/>\n + <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n <td></td>\n </tr>\n <tr>\n @@ -78,7 +78,7 @@ <tr>\n <td>open</td>\n <!-- create a Foo -->\n - <td tal:content="string: ${here/portal_url}/foo_module/Foo_createObjects?start:int=1&num:int=1"/>\n + <td>${base_url}/foo_module/Foo_createObjects?start:int=1&num:int=1</td>\n <td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml index 96bd24f05fb18cc78122a1fb18fe836684463b26..80ae9d3107e0a6dc3cd762d8dd57ca15e6d8389b 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml @@ -61,7 +61,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 diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 3d41066559f79350d72b566ac05f2c8823f7a999..8e9088e93bacfb905291087b6d86438b757cd912 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -410 \ No newline at end of file +411 \ No newline at end of file diff --git a/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml b/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml index 805641494007d8f89909bc65f294018c079b9423..c6649451d4bcedf5c87f0776dbeb1a9daa51832c 100644 --- a/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml +++ b/bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml @@ -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 diff --git a/bt5/erp5_web_ui_test/bt/revision b/bt5/erp5_web_ui_test/bt/revision index 62f9457511f879886bb7728c986fe10b0ece6bcb..c7930257dfef505fd996e1d6f22f2f35149990d0 100644 --- a/bt5/erp5_web_ui_test/bt/revision +++ b/bt5/erp5_web_ui_test/bt/revision @@ -1 +1 @@ -6 \ No newline at end of file +7 \ No newline at end of file