From eebc682f4875e7a32e25a7dcf8fb769d83cb5516 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Sat, 8 Feb 2020 03:51:30 +0100
Subject: [PATCH] fixed __str__ int error

---
 src/common/email.py  | 54 ++++++++++++++++++++++----------------------
 src/images/models.py |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/common/email.py b/src/common/email.py
index 07816cf..746b4cc 100644
--- a/src/common/email.py
+++ b/src/common/email.py
@@ -12,47 +12,47 @@ def read_email(name):
 
 
 def registration(user):
-    # subject = "KszkĂŠpzĂŠs regisztrĂĄciĂł"
-    # message = read_email('registration.txt')
-    # message = str.format(message % {'name': user.get_full_name()})
-    # send_mail(subject, message, sender_email, [user.email, ])
+    subject = "KszkĂŠpzĂŠs regisztrĂĄciĂł"
+    message = read_email('registration.txt')
+    message = str.format(message % {'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
     pass
 
 
 def admitted(user):
     subject = "JelentkezĂŠs eredmĂŠnye"
-    # message = read_email('admitted.txt')
-    # message = str.format(message % {'name': user.get_full_name()})
-    # send_mail(subject, message, sender_email, [user.email, ])
+    message = read_email('admitted.txt')
+    message = str.format(message % {'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
     pass
 
 
 def denied(user):
-    # subject = "JelentkezĂŠs eredmĂŠnye"
-    # message = read_email('denied.txt')
-    # message = str.format(message % {'name': user.get_full_name()})
-    # send_mail(subject, message, sender_email, [user.email, ])
+    subject = "JelentkezĂŠs eredmĂŠnye"
+    message = read_email('denied.txt')
+    message = str.format(message % {'name': user.get_full_name()})
+    send_mail(subject, message, sender_email, [user.email, ])
     pass
 
 
 def new_homework(user, deadline):
-    # deadline = deadline.strftime('%Y-%m-%d %H:%M')
-    # subject = "Új házifeladat"
-    # message = read_email('new_homework.txt')
-    # message = str.format(
-    #     message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
-    # send_mail(subject, message, sender_email, [user.email, ])
+    deadline = deadline.strftime('%Y-%m-%d %H:%M')
+    subject = "Új házifeladat"
+    message = read_email('new_homework.txt')
+    message = str.format(
+        message % {'name': user.get_full_name(), 'link': link, 'deadline': deadline})
+    send_mail(subject, message, sender_email, [user.email, ])
     pass
 
 
 def homework_corrected(user, title, accepted):
-    # subject = "HĂĄzifeladat eredmĂŠnye"
-    # if accepted:
-    #     status = 'Elfogadva'
-    # else:
-    #     status = 'HibĂĄs'
-    # message = read_email('homework_corrected.txt')
-    # message = str.format(message % {'name': user.get_full_name(
-    # ), 'link': link, 'status': status, 'title': title})
-    # send_mail(subject, message, sender_email, [user.email, ])
-    pass
\ No newline at end of file
+    subject = "HĂĄzifeladat eredmĂŠnye"
+    if accepted:
+        status = 'Elfogadva'
+    else:
+        status = 'HibĂĄs'
+    message = read_email('homework_corrected.txt')
+    message = str.format(message % {'name': user.get_full_name(
+    ), 'link': link, 'status': status, 'title': title})
+    send_mail(subject, message, sender_email, [user.email, ])
+    pass
diff --git a/src/images/models.py b/src/images/models.py
index d515aef..bd1d716 100644
--- a/src/images/models.py
+++ b/src/images/models.py
@@ -7,4 +7,4 @@ class Images(models.Model):
         )
 
     def __str__(self):
-        return self.id
+        return str(self.id)
-- 
GitLab