Commit 323d9130 authored by Jérome Perrin's avatar Jérome Perrin

API change: "description" key is now a list of lines (both main description and line description)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22681 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ad646372
...@@ -69,18 +69,25 @@ ...@@ -69,18 +69,25 @@
request = context.REQUEST\n request = context.REQUEST\n
\n \n
def getFieldAsString(field):\n def getFieldAsString(field):\n
return \', \'.join(getFieldAsLineList(field))\n
\n
def getFieldAsLineList(field):\n
"""Returns the text as a list of lines."""\n
field = field or \'\'\n field = field or \'\'\n
text = field.replace(\'\\r\', \'\')\n text = field.replace(\'\\r\', \'\')\n
text_list = text.split(\'\\n\')\n text_list = text.split(\'\\n\')\n
text_list = [x for x in text_list if x]\n return [x for x in text_list if x]\n
return \', \'.join(text_list)\n
\n \n
def getProductAndLineDesc(prod_desc, line_desc):\n def getProductAndLineDesc(prod_desc, line_desc):\n
if prod_desc and line_desc and \'\\n\' not in prod_desc and \'\\n\' not in line_desc:\n
return (\' - \'.join([getFieldAsString(prod_desc),\n
getFieldAsString(line_desc)]),)\n
line_list = []\n
if prod_desc:\n if prod_desc:\n
line_list.extend(getFieldAsLineList(prod_desc))\n
if line_desc:\n if line_desc:\n
return \' - \'.join([getFieldAsString(prod_desc), getFieldAsString(line_desc)])\n line_list.extend(getFieldAsLineList(line_desc))\n
return getFieldAsString(prod_desc)\n return line_list\n
return getFieldAsString(line_desc)\n
\n \n
def getOneLineAddress(text, region):\n def getOneLineAddress(text, region):\n
text_list = [getFieldAsString(text)]\n text_list = [getFieldAsString(text)]\n
...@@ -164,8 +171,8 @@ for line in getSubLineList(context):\n ...@@ -164,8 +171,8 @@ for line in getSubLineList(context):\n
display_id = \'translated_title\'\n display_id = \'translated_title\'\n
if request.get(\'international_form\'):\n if request.get(\'international_form\'):\n
display_id = \'title\'\n display_id = \'title\'\n
desc = \', \'.join([x[0] for x in\n desc = (\', \'.join([x[0] for x in\n
line.getVariationCategoryItemList(display_id=display_id)])\n line.getVariationCategoryItemList(display_id=display_id)]),)\n
line_dict = {\n line_dict = {\n
\'style_name\': \'Table_20_Contents\',\n \'style_name\': \'Table_20_Contents\',\n
\'left_style_name\': \'Table_20_Contents_20_Left\',\n \'left_style_name\': \'Table_20_Contents_20_Left\',\n
...@@ -264,7 +271,7 @@ data_dict = {\n ...@@ -264,7 +271,7 @@ data_dict = {\n
\n \n
\'total_price_novat\': total_price,\n \'total_price_novat\': total_price,\n
\'vat_list\': context.searchFolder(portal_type=context.getPortalTaxMovementTypeList(), order_by=\'title\'),\n \'vat_list\': context.searchFolder(portal_type=context.getPortalTaxMovementTypeList(), order_by=\'title\'),\n
\'description\': getFieldAsString(context.getDescription()),\n \'description\': getFieldAsLineList(context.getDescription()),\n
\'specialise_title\': context.getProperty(\'specialise_title\',\'\'),\n \'specialise_title\': context.getProperty(\'specialise_title\',\'\'),\n
\n \n
\'line_list\': line_list,\n \'line_list\': line_list,\n
...@@ -325,6 +332,7 @@ return unicodeDict(data_dict)\n ...@@ -325,6 +332,7 @@ return unicodeDict(data_dict)\n
<string>context</string> <string>context</string>
<string>T_</string> <string>T_</string>
<string>request</string> <string>request</string>
<string>getFieldAsLineList</string>
<string>getFieldAsString</string> <string>getFieldAsString</string>
<string>getProductAndLineDesc</string> <string>getProductAndLineDesc</string>
<string>getOneLineAddress</string> <string>getOneLineAddress</string>
......
374 375
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment