Commit 07955c90 authored by Jérome Perrin's avatar Jérome Perrin

use the title of the budget variation as the name of the variation

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36420 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f022f048
...@@ -60,6 +60,20 @@ item_list = filter(lambda x: x not in [(\'\',\'\'), [\'\',\'\']],\\\n ...@@ -60,6 +60,20 @@ item_list = filter(lambda x: x not in [(\'\',\'\'), [\'\',\'\']],\\\n
sub_field_dict = {}\n sub_field_dict = {}\n
split_depth = 1\n split_depth = 1\n
\n \n
# build a dict of title to display, based on the titles of corresponding\n
# budget variations\n
base_category_title_dict = dict()\n
budget_line = container.REQUEST.get(\'here\')\n
if budget_line is not None:\n
budget_model =budget_line.getParentValue().getSpecialiseValue()\n
if budget_model is not None:\n
for budget_variation in budget_model.contentValues():\n
if budget_variation.hasTitle():\n
base_category_title_dict[\n
budget_variation.getProperty(\'variation_base_category\')\n
] = budget_variation.getTitle()\n
\n
\n
resolveCategory = context.getPortalObject().portal_categories.resolveCategory\n resolveCategory = context.getPortalObject().portal_categories.resolveCategory\n
\n \n
for item in item_list:\n for item in item_list:\n
...@@ -88,6 +102,9 @@ for item in item_list:\n ...@@ -88,6 +102,9 @@ for item in item_list:\n
sub_field_dict[item_key][\'value\'] =\\\n sub_field_dict[item_key][\'value\'] =\\\n
sub_field_dict[item_key][\'value\'] + [item_value]\n sub_field_dict[item_key][\'value\'] + [item_value]\n
\n \n
if base_category in base_category_title_dict:\n
sub_field_dict[item_key][\'title\'] = base_category_title_dict[base_category]\n
else:\n
base_category_value = resolveCategory(base_category)\n base_category_value = resolveCategory(base_category)\n
if base_category_value is not None:\n if base_category_value is not None:\n
sub_field_dict[item_key][\'title\'] = base_category_value.getTranslatedTitle()\n sub_field_dict[item_key][\'title\'] = base_category_value.getTranslatedTitle()\n
...@@ -138,10 +155,18 @@ return sub_field_dict.values()\n ...@@ -138,10 +155,18 @@ return sub_field_dict.values()\n
<string>filter</string> <string>filter</string>
<string>sub_field_dict</string> <string>sub_field_dict</string>
<string>split_depth</string> <string>split_depth</string>
<string>dict</string>
<string>base_category_title_dict</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>container</string>
<string>budget_line</string>
<string>None</string>
<string>budget_model</string>
<string>_getiter_</string>
<string>budget_variation</string>
<string>_write_</string>
<string>context</string> <string>context</string>
<string>resolveCategory</string> <string>resolveCategory</string>
<string>_getiter_</string>
<string>item</string> <string>item</string>
<string>_getitem_</string> <string>_getitem_</string>
<string>int</string> <string>int</string>
...@@ -151,9 +176,7 @@ return sub_field_dict.values()\n ...@@ -151,9 +176,7 @@ return sub_field_dict.values()\n
<string>item_key</string> <string>item_key</string>
<string>base_category</string> <string>base_category</string>
<string>sub_field_property_dict</string> <string>sub_field_property_dict</string>
<string>_write_</string>
<string>base_category_value</string> <string>base_category_value</string>
<string>None</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
282 283
\ 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