mirror of
https://github.com/apache/superset.git
synced 2024-09-12 08:39:45 -04:00
Fix NoneType bug & fill the test recipients with original recipients if empty (#7365)
This commit is contained in:
parent
929fb6bbb8
commit
4fe152d156
@ -90,9 +90,12 @@ class EmailScheduleView(SupersetModelView, DeleteMixin):
|
|||||||
edit_form_extra_fields = add_form_extra_fields
|
edit_form_extra_fields = add_form_extra_fields
|
||||||
|
|
||||||
def process_form(self, form, is_created):
|
def process_form(self, form, is_created):
|
||||||
recipients = form.test_email_recipients.data.strip() or None
|
if form.test_email_recipients.data:
|
||||||
|
test_email_recipients = form.test_email_recipients.data.strip()
|
||||||
|
else:
|
||||||
|
test_email_recipients = None
|
||||||
self._extra_data['test_email'] = form.test_email.data
|
self._extra_data['test_email'] = form.test_email.data
|
||||||
self._extra_data['test_email_recipients'] = recipients
|
self._extra_data['test_email_recipients'] = test_email_recipients
|
||||||
|
|
||||||
def pre_add(self, obj):
|
def pre_add(self, obj):
|
||||||
try:
|
try:
|
||||||
@ -111,7 +114,7 @@ class EmailScheduleView(SupersetModelView, DeleteMixin):
|
|||||||
def post_add(self, obj):
|
def post_add(self, obj):
|
||||||
# Schedule a test mail if the user requested for it.
|
# Schedule a test mail if the user requested for it.
|
||||||
if self._extra_data['test_email']:
|
if self._extra_data['test_email']:
|
||||||
recipients = self._extra_data['test_email_recipients']
|
recipients = self._extra_data['test_email_recipients'] or obj.recipients
|
||||||
args = (self.schedule_type, obj.id)
|
args = (self.schedule_type, obj.id)
|
||||||
kwargs = dict(recipients=recipients)
|
kwargs = dict(recipients=recipients)
|
||||||
schedule_email_report.apply_async(args=args, kwargs=kwargs)
|
schedule_email_report.apply_async(args=args, kwargs=kwargs)
|
||||||
|
Loading…
Reference in New Issue
Block a user