Commit a98c89de authored by Romain Courteaud's avatar Romain Courteaud

Display a translated title with SupplyLine_asCellRange, instead of displaying...

Display a translated title with SupplyLine_asCellRange, instead of displaying the title saved on the Predicate.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10144 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f1ee5b02
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
portal = context.getPortalObject()\n
N_ = portal.Base_translateString\n
\n
cell_range = []\n cell_range = []\n
add_predicate = 1\n add_predicate = 1\n
\n \n
...@@ -139,7 +142,28 @@ if add_predicate == 1:\n ...@@ -139,7 +142,28 @@ if add_predicate == 1:\n
price_parameter = price_parameter[len(option_base_id_begin_with):]\n price_parameter = price_parameter[len(option_base_id_begin_with):]\n
predicate_list = context.getQuantityPredicateValueList(price_parameter)\n predicate_list = context.getQuantityPredicateValueList(price_parameter)\n
if matrixbox == 1:\n if matrixbox == 1:\n
pred_ids = [(x.getRelativeUrl(), x.getTitle()) for x in predicate_list]\n # pred_ids = [(x.getRelativeUrl(), x.getTitle()) for x in predicate_list]\n
# Translate the matrixbox ranges\n
pred_ids = []\n
for predicate in predicate_list:\n
predicate_criterion_list = predicate.getCriterionList()\n
predicate_title = \'\'\n
for criterion in predicate_criterion_list:\n
if criterion.property == \'quantity\':\n
min_qty = criterion.min\n
max_qty = criterion.max\n
if min_qty is None:\n
predicate_title = N_("Quantity < ${max_quantity}",\n
mapping={\'max_quantity\': max_qty})\n
elif max_qty is None:\n
predicate_title = N_("${min_quantity} <= Quantity",\n
mapping={\'min_quantity\': min_qty})\n
else:\n
predicate_title = N_("${min_quantity} <= Quantity < ${max_quantity}",\n
mapping={\'min_quantity\': min_qty,\n
\'max_quantity\': max_qty})\n
break\n
pred_ids.append((predicate.getRelativeUrl(), predicate_title))\n
else:\n else:\n
pred_ids = [x.getRelativeUrl() for x in predicate_list]\n pred_ids = [x.getRelativeUrl() for x in predicate_list]\n
# Insert predicat list for display in columns\n # Insert predicat list for display in columns\n
...@@ -169,6 +193,12 @@ return cell_range\n ...@@ -169,6 +193,12 @@ return cell_range\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>base_id=\'path\', matrixbox=0, display_base_category=1, option_variation=0, **kw</string> </value> <value> <string>base_id=\'path\', matrixbox=0, display_base_category=1, option_variation=0, **kw</string> </value>
...@@ -202,10 +232,12 @@ return cell_range\n ...@@ -202,10 +232,12 @@ return cell_range\n
<string>display_base_category</string> <string>display_base_category</string>
<string>option_variation</string> <string>option_variation</string>
<string>kw</string> <string>kw</string>
<string>cell_range</string>
<string>add_predicate</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>portal</string>
<string>N_</string>
<string>cell_range</string>
<string>add_predicate</string>
<string>no_option_base_category_list</string> <string>no_option_base_category_list</string>
<string>base_category_list</string> <string>base_category_list</string>
<string>append</string> <string>append</string>
...@@ -223,6 +255,13 @@ return cell_range\n ...@@ -223,6 +255,13 @@ return cell_range\n
<string>option_base_id_begin_with</string> <string>option_base_id_begin_with</string>
<string>predicate_list</string> <string>predicate_list</string>
<string>pred_ids</string> <string>pred_ids</string>
<string>predicate</string>
<string>predicate_criterion_list</string>
<string>predicate_title</string>
<string>criterion</string>
<string>min_qty</string>
<string>max_qty</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
18 21
\ No newline at end of file \ No newline at end of file
None
\ 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