Commit 550b4827 authored by Alexandre Boeglin's avatar Alexandre Boeglin

revert r9679, which was a mistake, and add better comments.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10644 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a347b30f
...@@ -458,14 +458,21 @@ class ERP5TypeInformation( FactoryTypeInformation, ...@@ -458,14 +458,21 @@ class ERP5TypeInformation( FactoryTypeInformation,
' base categories : %s' % (base_category_script_id, ' base categories : %s' % (base_category_script_id,
', '.join(dynamic_base_category_list)) ', '.join(dynamic_base_category_list))
else: else:
# no base_category needs to be retrieved using the script, we use
# a list containing an empty dict to trick the system into
# creating one category_value_dict (which will only use statically
# defined categories)
category_result = [{}] category_result = [{}]
# add the result to role_category_list_dict, aggregated with
# category_order and statically defined categories
for role in role_text.split(';'): for role in role_text.split(';'):
# category_result is a list of dicts that represents the resolved
# categories we create a category_value_dict from each of these
# dicts aggregated with category_order and statically defined
# categories
role = role.strip() role = role.strip()
role_category_list = role_category_list_dict.setdefault(role, []) role_category_list = role_category_list_dict.setdefault(role, [])
category_value_dict = {'category_order':category_order_list}
for category_dict in category_result: for category_dict in category_result:
category_value_dict = {'category_order':category_order_list}
category_value_dict.update(category_dict) category_value_dict.update(category_dict)
for c in definition['category']: for c in definition['category']:
bc, value = c.split('/', 1) bc, value = c.split('/', 1)
......
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