From c2ef4e5706cf15c75e303580b943459062eef6d0 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Thu, 28 Jan 2010 15:38:49 +0000 Subject: [PATCH] fix some mistakes in ApparelModel scripts git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32066 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ApparelModel_PrintoutFormView/prototype_title.xml | 2 +- .../portal_skins/erp5_apparel/ApparelModel_getDataDict.xml | 6 +++--- bt5/erp5_apparel/bt/revision | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_PrintoutFormView/prototype_title.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_PrintoutFormView/prototype_title.xml index 47704e91af..31e8c450a6 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_PrintoutFormView/prototype_title.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_PrintoutFormView/prototype_title.xml @@ -275,7 +275,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.ApparelModel_getPrototype() is not None and here.ApparelModel_getPrototype().getDestinationReference() or here.ApparelModel_getPrototype().getTitle()</string> </value> + <value> <string>python: here.ApparelModel_getPrototype() is not None and here.ApparelModel_getPrototype().getDestinationReference() or \'\'</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getDataDict.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getDataDict.xml index 1e97010f49..6d5e89432a 100644 --- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getDataDict.xml +++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_getDataDict.xml @@ -105,8 +105,8 @@ def getShapeMainImagePath():\n apparel_shape = context.getSpecialiseValue(portal_type=\'Apparel Shape\')\n if apparel_shape:\n technical_drawing_list = apparel_shape.contentValues(portal_type=\'Apparel Technical Drawing\')\n - if len(technical_drawing_list):\n - return technical_drawing_list[0].absolute_url()\n + if len(technical_drawing_list):\n + return technical_drawing_list[0].absolute_url()\n return None\n \n def getPrototype():\n @@ -126,7 +126,7 @@ data_dict = {\n \'morphology_title\': getMorphologyTitle() or \'\',\n \'shape_main_image_path\': getShapeMainImagePath() or \'\',\n \'prototype_title\': getPrototype() is not None and \\\n - getPrototype().getDestinationReference() or getPrototype().getTitle(),\n + getPrototype().getDestinationReference() or \'\',\n \'prototype_image_path\': getPrototype() is not None and getPrototype().absolute_url() or \'\',\n \'preferred_organisation_image_path\': getPreferredOrganisation() is not None\\\n and getPreferredOrganisation().getDefaultImageAbsoluteUrl() or \'\',\n diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision index 8a32cf7839..f123c4f4b5 100644 --- a/bt5/erp5_apparel/bt/revision +++ b/bt5/erp5_apparel/bt/revision @@ -1 +1 @@ -250 \ No newline at end of file +251 \ No newline at end of file -- 2.30.9