Projet

Général

Profil

0001-search-duplicates-in-workflow-fields-fixes-30395.patch

Benjamin Dauvergne, 05 février 2019 12:18

Télécharger (1,62 ko)

Voir les différences: 

Subject: [PATCH] search duplicates in workflow fields (fixes #30395)


 wcs_olap/feeder.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
wcs_olap/feeder.py
536 536 

  		




  537
  537
  
    
        comments = {}

  		




  538
  538
  
    

  		




  539
  
  
    
        duplicated_varnames = {}

  		




  540
  
  
    
        field_varnames = {}

  		




  541
  
  
    
        for field in self.formdef.schema.fields:

  		




  542
  
  
    
            if field.varname in field_varnames:

  		




  543
  
  
    
                duplicated_varnames[field.varname] = True

  		




  544
  
  
    
            field_varnames[field.varname] = True

  		




  545
  
  
    

  		




  546
  
  
    
        # add item fields

  		




  
  539
  
    
        # compute list of fields

  		




  547
  540
  
    
        fields = self.formdef.schema.fields

  		




  548
  541
  
    
        if self.formdef.schema.workflow:

  		




  549
  542
  
    
            fields += self.formdef.schema.workflow.fields

  		




  
  543
  
    

  		




  
  544
  
    
        # add item fields

  		




  
  545
  
    
        already_seen_varnames = set()

  		




  550
  546
  
    
        for field in fields:

  		




  551
  547
  
    
            if field.anonymise is True:

  		




  552
  548
  
    
                continue

  		




  553
  549
  
    
            if not field.varname or '-' in field.varname:

  		




  554
  550
  
    
                continue

  		




  555
  
  
    
            if field.varname in duplicated_varnames:

  		




  
  551
  
    
            if field.varname in already_seen_varnames:

  		




  556
  552
  
    
                continue

  		




  
  553
  
    
            already_seen_varnames.add(field.varname)

  		




  557
  554
  
    
            if field.type == 'item':

  		




  558
  555
  
    
                comment = (u'valeurs du champ « %s » du formulaire %s'

  		




  559
  556
  
    
                           % (field.label, self.formdef.schema.name))

  		




  560
  
  
    
-