Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

email_subject*: don't fail if SPIDERMON_EMAIL_SUBJECT_TEMPLATE is configured in favor of SPIDERMON_EMAIL_SUBJECT #155

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

email_subject*: don't fail if SPIDERMON_EMAIL_SUBJECT_TEMPLATE is configured in favor of SPIDERMON_EMAIL_SUBJECT #155

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75f7551
email_subject*: don't fail if email_subject_template is configured
Toritrae May 2, 2019
fa45b00
email_subject: Clarify error-meessage
Toritrae May 3, 2019
7051a7d
email_subject: Fix line length and formatting
Toritrae May 3, 2019
6970477
Merge branch 'master' into fix_email_subject_template_usage
rennerocha Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spidermon/contrib/actions/email/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(
raise NotConfigured(
"You must provide at least one recipient for the message."
)
if not self.subject:
if not self.subject and not self.subject_template:
raise NotConfigured("You must provide a subject for the message.")
Gallaecio marked this conversation as resolved.
Show resolved Hide resolved
if not (
self.body_text or body_text_template or body_html or self.body_html_template
Expand Down