formdata: keep native ('raw') values in get_dict_with_varnames (#7132)

This is not advertised but may come handy later.
This commit is contained in:
Frédéric Péters 2015-05-19 10:56:42 +02:00
parent e65b09fb2f
commit 46d8878fbd
1 changed files with 4 additions and 0 deletions

View File

@ -35,9 +35,11 @@ def get_dict_with_varnames(fields, data, formdata=None, varnames_only=False):
for field in fields:
if not hasattr(field, 'get_view_value'):
continue
raw_value = None
if data is not None:
value = data.get(field.id)
if field.convert_value_to_str:
raw_value = value
value = field.convert_value_to_str(value)
display_value = data.get('%s_display' % field.id)
else:
@ -65,6 +67,8 @@ def get_dict_with_varnames(fields, data, formdata=None, varnames_only=False):
if formdata is not None:
new_data['var_%s_url' % field.varname] = '%sdownload?f=%s' % (
formdata.get_url(), field.id)
elif raw_value:
new_data['var_%s_raw' % field.varname] = raw_value
return new_data
def flatten_dict(d):