diff --git a/README.md b/README.md index 6f6f1326..13fee6be 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ Expomap project from settings import * DEBUG = True +# emencia.django.newsletter +LOCAL_DEV = True +# sorl.thumbnail +THUMBNAIL_DEBUG = True DEFAULT_HTTP_SCHEME = 'http' diff --git a/apps/emencia/django/newsletter/mailer.py b/apps/emencia/django/newsletter/mailer.py index 76ebea83..2f6fa504 100644 --- a/apps/emencia/django/newsletter/mailer.py +++ b/apps/emencia/django/newsletter/mailer.py @@ -409,7 +409,7 @@ class NewsLetterSender(object): template = get_template('newsletter/AutomaticEmail_v2.html') context.update(announce_context) content = template.render(context) - elif self.newsletter.ab_testing == True: + elif self.newsletter.ab_testing: if self.ab_state == Newsletter.A: content = self.newsletter_template.render(context) else: diff --git a/apps/emencia/django/newsletter/management/commands/newsletter_create_announce.py b/apps/emencia/django/newsletter/management/commands/newsletter_create_announce.py index 998f1967..f2f2ee63 100644 --- a/apps/emencia/django/newsletter/management/commands/newsletter_create_announce.py +++ b/apps/emencia/django/newsletter/management/commands/newsletter_create_announce.py @@ -1,14 +1,17 @@ """Command for sending the newsletter""" -from datetime import date, timedelta +from datetime import date from django.core.management.base import NoArgsCommand from emencia.django.newsletter.models import MailingList class Command(NoArgsCommand): - """this command run every day. check date and creates newsletter the day before announces need to send""" + """ + This command run every day. + Check date and creates newsletter the day before announces need to send + """ help = 'create the announce every week.' def handle(self, *args, **options): announce_list = MailingList.objects.get(id=1) day = date.today() - announce_list.generate_announce_newsletter(day) \ No newline at end of file + announce_list.generate_announce_newsletter(day) diff --git a/apps/emencia/django/newsletter/management/commands/newsletter_create_dailymail.py b/apps/emencia/django/newsletter/management/commands/newsletter_create_dailymail.py index bd3d4c2d..bbe3f2a9 100644 --- a/apps/emencia/django/newsletter/management/commands/newsletter_create_dailymail.py +++ b/apps/emencia/django/newsletter/management/commands/newsletter_create_dailymail.py @@ -5,8 +5,7 @@ from datetime import date, timedelta from django.core.management.base import NoArgsCommand from django.utils.translation import activate -from functions.form_check import translit_with_separator -from emencia.django.newsletter.models import MailingList, Newsletter +from emencia.django.newsletter.models import Newsletter class Command(NoArgsCommand): @@ -26,8 +25,9 @@ class Command(NoArgsCommand): 'slug': 'dailymail-{date}'.format(date=day), 'status': Newsletter.WAITING, } - n, created = Newsletter.objects.get_or_create( + Newsletter.objects.get_or_create( dailymail=True, sending_date=day, - defaults=defaults) + defaults=defaults + ) day += timedelta(days=1) diff --git a/apps/emencia/django/newsletter/management/commands/send_newsletter.py b/apps/emencia/django/newsletter/management/commands/send_newsletter.py index 9ceaba5b..f88b2c12 100644 --- a/apps/emencia/django/newsletter/management/commands/send_newsletter.py +++ b/apps/emencia/django/newsletter/management/commands/send_newsletter.py @@ -33,7 +33,7 @@ class Command(NoArgsCommand): for newsletter in Newsletter.objects.exclude( status__in=[Newsletter.DRAFT, Newsletter.SENT, - Newsletter.CANCELED,]): + Newsletter.CANCELED]): mailer = Mailer(newsletter, verbose=self.verbose) if mailer.can_send: mailer.run() diff --git a/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 5e595273..78a187f4 100644 --- a/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -673,7 +673,7 @@ {% endif %} - © 2008 — 2016 Expomap.ru + © 2008 — 2017 Expomap.ru diff --git a/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html b/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html index 5ebc2808..56724615 100644 --- a/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html +++ b/apps/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html @@ -671,7 +671,7 @@ {% trans "Переслать другу" %} {% trans "или" %} {% trans "Отписаться" %} - © 2008 — 2016 Expomap.ru + © 2008 — 2017 Expomap.ru diff --git a/apps/emencia/django/newsletter/utils/newsletter.py b/apps/emencia/django/newsletter/utils/newsletter.py index 8eb19f01..3c9cdc61 100644 --- a/apps/emencia/django/newsletter/utils/newsletter.py +++ b/apps/emencia/django/newsletter/utils/newsletter.py @@ -36,8 +36,8 @@ def track_links(content, context): link_href = link_markup['href'] link_title = link_markup.get('title', link_href) try: - link, created = Link.objects.get_or_create(url=link_href, - defaults={'title': link_title}) + link, created = Link.objects.get_or_create(url=link_href[:250], + defaults={'title': link_title[:250]}) except Link.MultipleObjectsReturned: link = Link.objects.filter(url=link_href)[0] link_markup['href'] = 'http://%s%s' % (context['domain'], reverse('newsletter_newsletter_tracking_link', diff --git a/apps/emencia/django/newsletter/views/admin_views.py b/apps/emencia/django/newsletter/views/admin_views.py index 7f2599b6..8100aa88 100644 --- a/apps/emencia/django/newsletter/views/admin_views.py +++ b/apps/emencia/django/newsletter/views/admin_views.py @@ -137,7 +137,6 @@ class ContactQueryDelete(RedirectView): url = reverse_lazy('newsletters_contact_list') filter_form = ContactFilterForm - def get(self, request, *args, **kwargs): form = self.filter_form(request.GET) if form.is_valid(): diff --git a/proj/settings.py b/proj/settings.py index 4e424535..0de4e410 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -402,8 +402,6 @@ INSTALLED_APPS = ( ) CRONJOBS = [ - ('8 * * * *', 'django.core.management.call_command', ['send_newsletter']), - ('0 * * * *', 'django.core.management.call_command', ['update_index', 'conference', '--remove', '--age=6']), ('5 * * * *', 'django.core.management.call_command', ['update_index', 'exposition', '--remove', '--age=6']), ('0 1,13 * * *', 'django.core.management.call_command', ['update_index', 'place_exposition', '--remove', '--age=24']), @@ -418,8 +416,8 @@ CRONJOBS = [ ('*/5 * * * *', 'django.core.management.call_command', ['update_views_cache']), ('40 6 * * * ', 'django.core.management.call_command', ['newsletter_contacts_remove_notactivated']), - # временно закомментировал по просьбе клиента - # ('41 5 * * *', 'django.core.management.call_command', ['newsletter_create_announce']), + ('30 2 * * *', 'django.core.management.call_command', ['newsletter_create_dailymail']), + ('35 * * * *', 'django.core.management.call_command', ['send_newsletter']), ('12 4 * * *', 'django.core.management.call_command', ['stats_daily']), ('5 10 * * *', 'django.core.management.call_command', ['update_events_filter_fields']), diff --git a/requirements.txt b/requirements.txt index b366156d..3e35ff28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ numpy==1.12.0 oauthlib==0.6.1 pandas==0.19.2 phonenumbers==6.0.0 -Pillow==2.5.3 +Pillow==3.4.2 polib==1.0.8 pylibmc==1.2.3 pymorphy==0.5.6