Projet

Général

Profil

0001-workflows-don-t-send-aggregation-emails-about-delete.patch

Thomas Noël, 23 août 2018 09:29

Télécharger (1,64 ko)

Voir les différences:

Subject: [PATCH] workflows: don't send aggregation emails about deleted
 formdef or formdata (#25776)

 wcs/wf/aggregation_email.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
wcs/wf/aggregation_email.py
114 114
            if formdef_id in cache:
115 115
                formdef, formdata, workflow = cache[formdef_id]
116 116
            else:
117
                formdef = FormDef.get(formdef_id)
117
                try:
118
                    formdef = FormDef.get(formdef_id)
119
                except KeyError:
120
                    # formdef has been deleted after AggregationEmail creation
121
                    continue
118 122
                formdata = formdef.data_class()
119 123
                workflow = formdef.workflow
120 124
                cache[formdef_id] = (formdef, formdata, workflow)
121 125

  
122
            data = formdata.get(item.get('formdata'))
126
            try:
127
                data = formdata.get(item.get('formdata'))
128
            except KeyError:
129
                continue
123 130
            status = data.get_status()
124 131
            url = item.get('formurl')
125 132

  
......
133 140

  
134 141
            body.append('- %sstatus (%s)' % (url, status.name))
135 142

  
143
        if not body:
144
            continue
145

  
136 146
        body = '\n'.join(body)
137 147

  
138 148
        mail_subject = _('New arrivals')
139
-