Commit c1f73b89 authored by Aurel's avatar Aurel

remove useless parameters even in listbox


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9905 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 936278cb
...@@ -920,8 +920,17 @@ class ListBoxRenderer: ...@@ -920,8 +920,17 @@ class ListBoxRenderer:
elif meta_type_list is not None: elif meta_type_list is not None:
params.setdefault('meta_type', meta_type_list) params.setdefault('meta_type', meta_type_list)
# Remove useless parameters. # Remove useless parameters as FileUpload
for k, v in params.items(): for k, v in params.items():
if k == "listbox":
# listbox can also contain useless parameters
new_list = []
for line in v:
for k1, v1 in line.items():
if v1 in (None, '') or hasattr(v1, 'read'):
del line[k1]
new_list.append(line)
params[k] = new_list
if v in (None, '') or hasattr(v, 'read'): if v in (None, '') or hasattr(v, 'read'):
del params[k] del params[k]
...@@ -961,7 +970,6 @@ class ListBoxRenderer: ...@@ -961,7 +970,6 @@ class ListBoxRenderer:
# objects in the current ListBox configuration. # objects in the current ListBox configuration.
if 'select_expression' in params: if 'select_expression' in params:
del params['select_expression'] del params['select_expression']
return params return params
getParamDict = VolatileCachingMethod(getParamDict) getParamDict = VolatileCachingMethod(getParamDict)
...@@ -1844,6 +1852,7 @@ class ListBoxRendererLine: ...@@ -1844,6 +1852,7 @@ class ListBoxRendererLine:
value_list.append((original_value, processed_value)) value_list.append((original_value, processed_value))
#LOG('ListBox.getValueList', 0, value_list)
return value_list return value_list
class ListBoxHTMLRendererLine(ListBoxRendererLine): class ListBoxHTMLRendererLine(ListBoxRendererLine):
......
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