From deb2cc3e9c2b1b2c7645e56d85d7e51bebbd2248 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 5 Feb 2019 12:16:49 +0100 Subject: [PATCH] search duplicates in workflow fields (fixes #30395) --- wcs_olap/feeder.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index d71af9e..809e645 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -536,24 +536,21 @@ class WcsFormdefFeeder(object): comments = {} - duplicated_varnames = {} - field_varnames = {} - for field in self.formdef.schema.fields: - if field.varname in field_varnames: - duplicated_varnames[field.varname] = True - field_varnames[field.varname] = True - - # add item fields + # compute list of fields fields = self.formdef.schema.fields if self.formdef.schema.workflow: fields += self.formdef.schema.workflow.fields + + # add item fields + already_seen_varnames = set() for field in fields: if field.anonymise is True: continue if not field.varname or '-' in field.varname: continue - if field.varname in duplicated_varnames: + if field.varname in already_seen_varnames: continue + already_seen_varnames.add(field.varname) if field.type == 'item': comment = (u'valeurs du champ « %s » du formulaire %s' % (field.label, self.formdef.schema.name)) -- 2.20.1