From 88195881829f8cd20a00091fb4ffddbbb4cf6c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 19 May 2015 10:55:36 +0200 Subject: [PATCH 1/5] formdata: add a varnames_only variant to get_dict_with_varnames (#7132) --- wcs/formdata.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/wcs/formdata.py b/wcs/formdata.py index b066132..7c56d01 100644 --- a/wcs/formdata.py +++ b/wcs/formdata.py @@ -30,7 +30,7 @@ from qommon.substitution import Substitutions from roles import Role -def get_dict_with_varnames(fields, data, formdata=None): +def get_dict_with_varnames(fields, data, formdata=None, varnames_only=False): new_data = {} for field in fields: if not hasattr(field, 'get_view_value'): @@ -43,12 +43,14 @@ def get_dict_with_varnames(fields, data, formdata=None): else: value = '' display_value = '' - # add it as f$n$ - new_data['f%s' % field.id] = value - # also add it as 'field_' + normalized(field label) - identifier_name = qommon.misc.simplify(field.label, space = '_') - new_data['field_' + identifier_name] = value + if not varnames_only: + # add it as f$n$ + new_data['f%s' % field.id] = value + + # also add it as 'field_' + normalized(field label) + identifier_name = qommon.misc.simplify(field.label, space = '_') + new_data['field_' + identifier_name] = value # and finally add it as its manually defined variable name if field.varname: -- 2.1.4