From: Guillaume Pellerin Date: Sun, 15 Jun 2025 23:03:50 +0000 (+0200) Subject: use settings.TELEFORMA_ADMIN as default sender for script message X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=23ff1122e5d7eadecf515206485a1968cdb4eaea;p=teleforma.git use settings.TELEFORMA_ADMIN as default sender for script message --- diff --git a/app/settings.py b/app/settings.py index c60ab74c..6976d14f 100644 --- a/app/settings.py +++ b/app/settings.py @@ -588,6 +588,7 @@ TELEFORMA_GLOBAL_TWEETER = False TELEFORMA_PERIOD_TWEETER = True TELEFORMA_EXAM_TOPIC_DEFAULT_DOC_TYPE_ID = 4 TELEFORMA_EXAM_SCRIPT_UPLOAD = True +TELEFORMA_ADMIN = "Admin-CRFPA" TELEFORMA_REGISTER_DEFAULT_DOC_ID = 5506 TELEFORMA_PERIOD_DEFAULT_ID = 34 TELEFORMA_EXAM_MAX_SESSIONS = 99 diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index d8abfba6..fd8fcf1a 100755 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -341,8 +341,7 @@ class Script(BaseResource): lower_quota = sorted(quota_list, key=lambda k: k['level'])[0] self.corrector = lower_quota['obj'].corrector else: - # FIXME: default corrector goes to settings - self.corrector = User.objects.filter(is_superuser=True)[1] + self.corrector = User.objects.get(username=settings.TELEFORMA_ADMIN) self.status = 3 # self.save() @@ -469,12 +468,14 @@ class Script(BaseResource): def mark(self): self.date_marked = datetime.datetime.now() site = Site.objects.all()[0] + default_corrector context = {'script': self, 'site': site} text = render_to_string('exam/messages/script_marked.txt', context) a = ugettext('Script') v = ugettext('marked') subject = '%s %s' % (a, v) - mess = Message(sender=self.corrector, recipient=self.author, + sender = User.objects.get(username=settings.TELEFORMA_ADMIN) + mess = Message(sender=sender, recipient=self.author, subject=subject[:119], body=text) mess.moderation_status = 'a' mess.save()