Commit 51199a3f authored by Jérome Perrin's avatar Jérome Perrin

Raise better error messages when provided a non existant category in _generatePropertyUidList



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7672 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 36ae0598
...@@ -172,15 +172,19 @@ class SimulationTool (BaseTool): ...@@ -172,15 +172,19 @@ class SimulationTool (BaseTool):
property_uid_list = [] property_uid_list = []
if type(property) is type('') : if type(property) is type('') :
if as_text == 0: if as_text == 0:
property_uid_list.append( prop_value = category_tool.getCategoryValue(property)
category_tool.getCategoryValue(property).getUid()) if prop_value is None:
raise ValueError, 'Category %s does not exists' % property
property_uid_list.append(prop_value.getUid())
else: else:
property_uid_list.append(property) property_uid_list.append(property)
elif type(property) is type([]) or type(property) is type(()) : elif type(property) is type([]) or type(property) is type(()) :
for property_item in property : for property_item in property :
if as_text == 0: if as_text == 0:
property_uid_list.append( prop_value = category_tool.getCategoryValue(property_item)
category_tool.getCategoryValue(property_item).getUid()) if prop_value is None:
raise ValueError, 'Category %s does not exists' % property_item
property_uid_list.append(prop_value.getUid())
else: else:
property_uid_list.append(property_item) property_uid_list.append(property_item)
elif type(property) is type({}) : elif type(property) is type({}) :
...@@ -189,8 +193,10 @@ class SimulationTool (BaseTool): ...@@ -189,8 +193,10 @@ class SimulationTool (BaseTool):
property['query'] = [property['query']] property['query'] = [property['query']]
for property_item in property['query'] : for property_item in property['query'] :
if as_text == 0: if as_text == 0:
tmp_uid_list.append( prop_value = category_tool.getCategoryValue(property_item)
category_tool.getCategoryValue(property_item).getUid()) if prop_value is None:
raise ValueError, 'Category %s does not exists' % property_item
tmp_uid_list.append(prop_value.getUid())
else: else:
tmp_uid_list.append(property_item) tmp_uid_list.append(property_item)
if len(tmp_uid_list) : if len(tmp_uid_list) :
...@@ -437,9 +443,9 @@ class SimulationTool (BaseTool): ...@@ -437,9 +443,9 @@ class SimulationTool (BaseTool):
omit_transit - do not evaluate transit_simulation_state omit_transit - do not evaluate transit_simulation_state
input_simulation_state - only take rows with specified input_simulation_state and quantity > 0 input_simulation_state - only take rows with specified simulation_state and quantity > 0
output_simulation_state - only take rows with specified output_simulation_state and quantity < 0 output_simulation_state - only take rows with specified simulation_state and quantity < 0
ignore_variation - do not take into account variation in inventory calculation (useless on getInventory, ignore_variation - do not take into account variation in inventory calculation (useless on getInventory,
but useful on getInventoryList) but useful on getInventoryList)
......
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