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 d04918081ca6869e3b723262da260e0cdd62100e..da2d7b249af3063bcb650b1e0ad31603ed4ae06b 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 @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PageTemplates.ZopePageTemplate</string> - <string>ZopePageTemplate</string> - </tuple> - <none/> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -59,7 +56,7 @@ <tal:block metal:define-macro="init">\n <tr>\n <td>store</td>\n - <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n + <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">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/ListBoxDialogModeZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml index e4c48c9dc54328227999e79b4a6c0d891f781c28..472dfaf8a45b3085744dba4fc0750f8c33158c71 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 @@ -57,7 +57,7 @@ <tal:block metal:define-macro="init">\n <tr>\n <td>store</td>\n - <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n + <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">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 c84c9e82e3bda03b2d4af2d891e2d6cf9484951a..5dc21702a1187053f9a01e32b8681173a5cc6abd 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 @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PageTemplates.ZopePageTemplate</string> - <string>ZopePageTemplate</string> - </tuple> - <none/> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -59,7 +56,7 @@ <tal:block metal:define-macro="init">\n <tr>\n <td>store</td>\n - <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n + <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">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 73e6be5f0e87f573f3be34bc35fae97513da289d..af6875577a4d06d3d0cd9ab664a6f4402091ede5 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 @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PageTemplates.ZopePageTemplate</string> - <string>ZopePageTemplate</string> - </tuple> - <none/> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -60,7 +57,7 @@ <!-- reuse listbox suite reset to clear modules. -->\n <tr>\n <td>store</td>\n - <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n + <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">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/RelationFieldZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml index 012cdf91367f0da3adc290a7cfd4d56bfdec22e8..1e8b5ff99b877422360c91ff9d875015b80d30d4 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 @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PageTemplates.ZopePageTemplate</string> - <string>ZopePageTemplate</string> - </tuple> - <none/> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -59,7 +56,7 @@ <tal:block metal:define-macro="init">\n <tr>\n <td>store</td>\n - <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n + <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">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/Zuite_setBaseUrl.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Zuite_setBaseUrl.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1455dccd6f63ea3e62063e6adc8b37273b8fe56 --- /dev/null +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Zuite_setBaseUrl.xml @@ -0,0 +1,152 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>portal = context.getPortalObject()\n +if portal.hasProperty(\'erp5_ui_test_base_url\'):\n + portal.manage_changeProperties(erp5_ui_test_base_url=base_url)\n +else:\n + portal.manage_addProperty(\'erp5_ui_test_base_url\', base_url, type=\'string\')\n +</string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_owner</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>base_url</string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>base_url</string> + <string>_getattr_</string> + <string>context</string> + <string>portal</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Zuite_setBaseUrl</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_ui_test/bt/change_log b/bt5/erp5_ui_test/bt/change_log index 3ca39824adac7ac24ca2f0d2e1651a2fb2d2aa90..20fa47d1a16ed886a0e202770c62691a5af9644c 100644 --- a/bt5/erp5_ui_test/bt/change_log +++ b/bt5/erp5_ui_test/bt/change_log @@ -1,3 +1,6 @@ +2008-02-22 jerome +* Add Zuite_setBaseUrl script which will be called before tests by test runner to set the erp5_ui_test_base_url property, and uses this in templates instead of portal ID. + 2008-02-21 kazuhiko * Add lines_field_zuite. diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index ef491079a37cc374abca2e517e35441c362236d2..4b74f2216dbbf61c34b833c71a1bf5ce78c85b6a 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -337 \ No newline at end of file +338 \ No newline at end of file