From 7012cf5509789c80fb9f1fac5e6ff69adf79c0aa Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 23 Jul 2018 17:34:37 +0300 Subject: [PATCH] make send email without system libs --- chatbot/email_bot.py | 1 - djing/local_settings.py.template | 7 +++++++ djing/settings.py | 10 ++++++++++ group_app/views.py | 1 - 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/chatbot/email_bot.py b/chatbot/email_bot.py index 889bbab..6c83e21 100644 --- a/chatbot/email_bot.py +++ b/chatbot/email_bot.py @@ -9,7 +9,6 @@ def send_notify(msg_text, account, tag='none'): try: MessageQueue.objects.push(msg=msg_text, user=account, tag=tag) target_email = account.email - print('send', target_email, type(target_email), 'from', getattr(settings, 'DEFAULT_FROM_EMAIL')) send_mail( subject=getattr(settings, 'COMPANY_NAME', 'Djing notify'), message=msg_text, diff --git a/djing/local_settings.py.template b/djing/local_settings.py.template index dccee29..88df9a2 100644 --- a/djing/local_settings.py.template +++ b/djing/local_settings.py.template @@ -62,3 +62,10 @@ API_AUTH_SUBNET = '127.0.0.0/8' # Company name COMPANY_NAME = 'Your company name' + +# Email config +EMAIL_HOST_USER = 'YOUR-EMAIL@mailserver.com' +EMAIL_HOST = 'smtp.mailserver.com' +EMAIL_PORT = 587 +EMAIL_HOST_PASSWORD = 'password' +EMAIL_USE_SSL = True diff --git a/djing/settings.py b/djing/settings.py index 02a8a5e..c564215 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -209,3 +209,13 @@ BOOTSTRAP3 = { # Field class to use in horizontal forms 'horizontal_field_class': 'col-md-9', } + + +# Email config +EMAIL_HOST_USER = local_settings.EMAIL_HOST_USER +EMAIL_HOST = local_settings.EMAIL_HOST +EMAIL_PORT = local_settings.EMAIL_PORT +EMAIL_HOST_PASSWORD = local_settings.EMAIL_HOST_PASSWORD +EMAIL_USE_SSL = getattr(local_settings, 'EMAIL_USE_SSL', True) + +SERVER_EMAIL = EMAIL_HOST_USER diff --git a/group_app/views.py b/group_app/views.py index 5aaa5de..8fee7aa 100644 --- a/group_app/views.py +++ b/group_app/views.py @@ -69,7 +69,6 @@ class DeleteGroupView(DeleteView): group_with_subscribers = models.Group.objects.annotate( subscribers_count=Count('abon') ).filter(subscribers_count__gt=0, pk=group_id).first() - print('group_with_subscribers:', group_with_subscribers) if group_with_subscribers is not None: messages.error(request, _('Group is contain subscribers. Remove them before delete group')) return HttpResponseRedirect(self.success_url)