.
This commit is contained in:
+6
-5
@@ -324,7 +324,7 @@ class ExamBase(models.Model):
|
||||
|
||||
return msg
|
||||
|
||||
def email_user_results(self, user, resend=False, additional_emails=list):
|
||||
def email_user_results(self, user, resend=False, additional_emails=None):
|
||||
#if self.results_email_sent and not resend:
|
||||
# return False, "Already sent."
|
||||
|
||||
@@ -332,7 +332,7 @@ class ExamBase(models.Model):
|
||||
msg = self.generate_user_report(user)
|
||||
|
||||
if not user.email:
|
||||
return False, "User has no email"
|
||||
return [False, "User has no email"]
|
||||
|
||||
emails = [user.email]
|
||||
|
||||
@@ -342,7 +342,7 @@ class ExamBase(models.Model):
|
||||
emails.append(supervisor_email)
|
||||
|
||||
|
||||
if additional_emails:
|
||||
if additional_emails is not None:
|
||||
emails.extend(additional_emails)
|
||||
|
||||
try:
|
||||
@@ -355,11 +355,11 @@ class ExamBase(models.Model):
|
||||
# html_message=html_msg,
|
||||
)
|
||||
except SMTPException as e:
|
||||
return False, e
|
||||
return [False, e]
|
||||
|
||||
#self.results_email_sent = True
|
||||
#self.save()
|
||||
return True, ""
|
||||
return [True, ""]
|
||||
|
||||
|
||||
class NoteType(models.Model):
|
||||
@@ -608,6 +608,7 @@ class CidUserExam(models.Model):
|
||||
|
||||
manual_submission = models.BooleanField(default=False)
|
||||
|
||||
# TODO switch to json field?
|
||||
results_emailed_status = models.CharField(max_length=255, blank=True)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user