diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.xml index f748c8b8fd4be93466ce08ce35032405b68fe070..c28e311cfa9153b2a9326446b71c6ad6198d593a 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.xml @@ -127,6 +127,7 @@ return url\n <string>selection</string> <string>_getattr_</string> <string>index</string> + <string>context</string> <string>object</string> <string>None</string> <string>url</string> @@ -144,6 +145,7 @@ return url\n <tuple> <none/> <none/> + <none/> </tuple> </value> </item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.xml index 0a081b0ee0314e1504d3b556280a48b925d99659..f8ef7d3bdec6f76983c851689e31e87f46fa12c5 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.xml @@ -133,6 +133,7 @@ return object.getPath() + \'/\' + method + \'?\' + make_query(kw)\n <string>make_query</string> <string>_getattr_</string> <string>index</string> + <string>context</string> <string>object</string> <string>method</string> <string>str</string> @@ -151,6 +152,7 @@ return object.getPath() + \'/\' + method + \'?\' + make_query(kw)\n <tuple> <none/> <none/> + <none/> </tuple> </value> </item> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml index 577ce77e9f388a66fc9be467520931a4b906ae7c..627d52b25ebf90204e3fcfec68e3c4412bcdab08 100644 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml +++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalDuration.xml @@ -68,9 +68,9 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if selection!=None:\n + <value> <string>if selection_name is not None:\n \n - reference_variation_category_list = selection.getParams()[\'reference_variation_category_list\' ]\n + reference_variation_category_list = context.portal_selections.getSelectionParamsFor(selection_name)[\'reference_variation_category_list\']\n request = context.REQUEST\n request.other[\'categories\'] = reference_variation_category_list\n tmp_context = context.asContext(context=context, REQUEST=request)\n @@ -105,7 +105,7 @@ else:\n </item> <item> <key> <string>_params</string> </key> - <value> <string>selection=None</string> </value> + <value> <string>selection=None, selection_name=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -125,18 +125,19 @@ else:\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>selection</string> + <string>selection_name</string> <string>None</string> <string>_getitem_</string> <string>_getattr_</string> - <string>reference_variation_category_list</string> <string>context</string> + <string>reference_variation_category_list</string> <string>request</string> <string>_write_</string> <string>tmp_context</string> @@ -155,6 +156,7 @@ else:\n <value> <tuple> <none/> + <none/> </tuple> </value> </item> diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml index a21d92cd1c3862758d6658235421772082439b44..fa638f772791655362176de717daeeca3ae8f6c9 100644 --- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml +++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Transformation_getTotalPrice.xml @@ -68,9 +68,9 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if selection!=None:\n + <value> <string>if selection_name is not None:\n \n - reference_variation_category_list = selection.getParams()[\'reference_variation_category_list\' ]\n + reference_variation_category_list = context.portal_selections.getSelectionParamsFor(selection_name)[\'reference_variation_category_list\']\n request = context.REQUEST\n request.other[\'categories\'] = reference_variation_category_list\n tmp_context = context.asContext(context=context, REQUEST=request)\n @@ -105,7 +105,7 @@ else:\n </item> <item> <key> <string>_params</string> </key> - <value> <string>selection=None</string> </value> + <value> <string>selection=None, selection_name=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -125,18 +125,19 @@ else:\n <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>selection</string> + <string>selection_name</string> <string>None</string> <string>_getitem_</string> <string>_getattr_</string> - <string>reference_variation_category_list</string> <string>context</string> + <string>reference_variation_category_list</string> <string>request</string> <string>_write_</string> <string>tmp_context</string> @@ -155,6 +156,7 @@ else:\n <value> <tuple> <none/> + <none/> </tuple> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_getDescriptionUrl.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_getDescriptionUrl.xml index 1b77294a71d9b0475a7b48331c27cefc8ce6aef7..80b14f84ad0febf290a4500ce8bbd3297d25d467 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_getDescriptionUrl.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Alarm_getDescriptionUrl.xml @@ -70,8 +70,6 @@ <key> <string>_body</string> </key> <value> <string>from ZTUtils import make_query\n \n -index = selection.getIndex()\n -name = selection.getName()\n object = brain.getObject()\n if object is None:\n return None\n @@ -131,8 +129,6 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n <string>ZTUtils</string> <string>make_query</string> <string>_getattr_</string> - <string>index</string> - <string>name</string> <string>object</string> <string>None</string> <string>url</string> diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/File_getDownloadUrl.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/File_getDownloadUrl.xml index 488e3fcb4ce52b8057cbc4de628ec99259bf1a00..f1f56ff571e7a84f28a708a1b58d1f0c9eb36aca 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/File_getDownloadUrl.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/File_getDownloadUrl.xml @@ -70,8 +70,7 @@ <key> <string>_body</string> </key> <value> <string>from ZTUtils import make_query\n \n -index = selection.getIndex()\n -name = selection.getName()\n +index = context.portal_selections.getSelectionIndexFor(selection_name)\n object = brain.getObject()\n if object is None:\n return None\n @@ -79,7 +78,7 @@ if object is None:\n url = object.absolute_url()\n method = \'Base_download\'\n kw = { \n - \'selection_name\' : selection.getName() ,\n + \'selection_name\' : selection_name,\n \'selection_index\' : index,\n }\n \n @@ -100,7 +99,7 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n </item> <item> <key> <string>_params</string> </key> - <value> <string>brain=None, selection=None</string> </value> + <value> <string>brain=None, selection=None, selection_name=None</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -120,7 +119,7 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n <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> @@ -128,11 +127,12 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n <tuple> <string>brain</string> <string>selection</string> + <string>selection_name</string> <string>ZTUtils</string> <string>make_query</string> <string>_getattr_</string> + <string>context</string> <string>index</string> - <string>name</string> <string>object</string> <string>None</string> <string>url</string> @@ -152,6 +152,7 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n <tuple> <none/> <none/> + <none/> </tuple> </value> </item>