Projet

Général

Profil

0001-forms-don-t-crash-on-suddently-missing-draft-34020.patch

Frédéric Péters, 16 juin 2019 20:55

Télécharger (1,93 ko)

Voir les différences: 

Subject: [PATCH] forms: don't crash on suddently missing draft (#34020)


 wcs/formdata.py   | 5 ++++-
 wcs/forms/root.py | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
wcs/formdata.py
712 712 
            if 'future_tracking_code' in self.data:
713 713 
                d['form_tracking_code'] = self.data['future_tracking_code']
714 714 
            elif 'draft_formdata_id' in self.data:
715 
                d['form_tracking_code'] = self.formdef.data_class().get(self.data['draft_formdata_id']).tracking_code
715 
                try:
716 
                    d['form_tracking_code'] = self.formdef.data_class().get(self.data['draft_formdata_id']).tracking_code
717 
                except KeyError:
718 
                    pass
716 719 

  		




  717
  720
  
    
        d['form_submission_backoffice'] = self.backoffice_submission

  		




  718
  721
  
    
        d['form_submission_channel'] = self.submission_channel

  		












  

    
      wcs/forms/root.py
    
  





  445
  445
  
    
            tracking_code = None

  		




  446
  446
  
    
            draft_formdata_id = data.get('draft_formdata_id')

  		




  447
  447
  
    
            if draft_formdata_id:

  		




  448
  
  
    
                formdata = self.formdef.data_class().get(draft_formdata_id)

  		




  449
  
  
    
                tracking_code = formdata.tracking_code

  		




  
  448
  
    
                try:

  		




  
  449
  
    
                    formdata = self.formdef.data_class().get(draft_formdata_id)

  		




  
  450
  
    
                    tracking_code = formdata.tracking_code

  		




  
  451
  
    
                except KeyError:

  		




  
  452
  
    
                    pass

  		




  450
  453
  
    
            else:

  		




  451
  454
  
    
                tracking_code = data.get('future_tracking_code')

  		




  452
  455
  
    

  		




  453
  
  
    
-