Projet

Général

Profil

0001-misc-remove-unused-exclude_current_user-parameter-53.patch

Frédéric Péters, 13 avril 2021 17:12

Télécharger (2,91 ko)

Voir les différences:

Subject: [PATCH] misc: remove unused exclude_current_user parameter (#53081)

 wcs/qommon/emails.py         | 6 ------
 wcs/qommon/ident/password.py | 8 ++------
 wcs/workflows.py             | 2 --
 3 files changed, 2 insertions(+), 14 deletions(-)
wcs/qommon/emails.py
160 160
    replyto=None,
161 161
    bcc=None,
162 162
    email_from=None,
163
    exclude_current_user=False,
164 163
    email_type=None,
165 164
    want_html=True,
166 165
    hide_recipients=False,
......
329 328
    if bcc:
330 329
        rcpts += bcc
331 330

  
332
    if exclude_current_user:
333
        user = get_request().user
334
        if user and user.email and user.email in rcpts:
335
            rcpts.remove(user.email)
336

  
337 331
    rcpts = [x for x in rcpts if x]
338 332
    if len(rcpts) == 0:
339 333
        return
wcs/qommon/ident/password.py
373 373
        }
374 374

  
375 375
        try:
376
            emails.custom_template_email(
377
                'change-password-request', data, user.email, exclude_current_user=False
378
            )
376
            emails.custom_template_email('change-password-request', data, user.email)
379 377
        except errors.EmailError:
380 378
            form.set_error('username', _('Failed to send email (server error)'))
381 379
            token.remove_self()
......
482 480
                    'hostname': get_request().get_server(),
483 481
                }
484 482

  
485
                emails.custom_template_email(
486
                    'new-generated-password', data, user.email, exclude_current_user=False
487
                )
483
                emails.custom_template_email('new-generated-password', data, user.email)
488 484

  
489 485
                return self.forgotten_token_end_page()
490 486
            else:
wcs/workflows.py
2979 2979
                email_rcpt=None,
2980 2980
                bcc=addresses,
2981 2981
                email_from=email_from,
2982
                exclude_current_user=False,
2983 2982
                attachments=attachments,
2984 2983
                fire_and_forget=True,
2985 2984
            )
......
2989 2988
                mail_body,
2990 2989
                email_rcpt=addresses,
2991 2990
                email_from=email_from,
2992
                exclude_current_user=False,
2993 2991
                attachments=attachments,
2994 2992
                fire_and_forget=True,
2995 2993
            )
2996
-