diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_uploadScreenshot.xml b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_uploadScreenshot.xml index 6df3f203435609dbfb473f1c5aa927802b090803..19bb31ac87aa779917a061cac4f23cc8122af655 100644 --- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_uploadScreenshot.xml +++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_uploadScreenshot.xml @@ -56,38 +56,31 @@ global msg\n msg = \'\'\n data_uri = context.REQUEST.form.get(\'data_uri\', \'default\')\n -def find_reference(reference, obj_list):\n - global msg\n - result = None\n - for obj in obj_list:\n - if obj.getReference() == reference:\n - result = obj\n - msg += reference + \' found\\n\'\n - break\n - return result\n \n -web_page = find_reference(web_page_reference, context.portal_catalog(portal_type = (\'Web Page\',\'Test Page\')))\n +image = context.portal_catalog.getResultValue(reference=image_reference, \n + portal_type="Image")\n \n -if web_page is None or not web_page:\n - return "Web page: " + str(web_page_reference) + " not found"\n -else:\n - image = find_reference(image_reference, web_page.objectValues(portal_type = \'Image\'))\n - if image is None or not image:\n - return "Image: " + str(image_reference) + " not found"\n +if image is None:\n + # Image is an embedded file\n + return "Image: " + str(image_reference) + " not found"\n \n image.setContentType(\'image/png\')\n data_text = data_uri.read()\n msg += \'dataUri : \' + data_text + \'\\n\'\n data = data_text.decode(\'base64\')\n msg += \'data : \' + data + \'\\n\'\n -image.edit(data = data, base_data = data, filename= str(image_reference) + \'.png\', content_type = \'image/png\')\n +image.edit(data=data, \n + base_data=data, \n + filename=str(image_reference) + \'.png\', \n + content_type = \'image/png\')\n +\n context.Zuite_updateImage(image)\n msg += \'done\'\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>data_uri, web_page_reference, image_reference</string> </value> + <value> <string>data_uri, image_reference</string> </value> </item> <item> <key> <string>_proxy_roles</string> </key> diff --git a/bt5/erp5_ui_test_core/bt/revision b/bt5/erp5_ui_test_core/bt/revision index 31ff414b74c276a48419201e1024d3b860413a3b..2e66562e2705f8e5c5ddccceeecaab861194f30a 100644 --- a/bt5/erp5_ui_test_core/bt/revision +++ b/bt5/erp5_ui_test_core/bt/revision @@ -1 +1 @@ -48 \ No newline at end of file +49 \ No newline at end of file