From 1e51eadd38aed3b372744d5714db3f3b3e88c696 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Wed, 5 Oct 2016 13:56:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../django/newsletter/migrations/0011_update_contact.py | 9 +++++---- fabfile.py | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/emencia/django/newsletter/migrations/0011_update_contact.py b/emencia/django/newsletter/migrations/0011_update_contact.py index 726b0488..c436d4ab 100644 --- a/emencia/django/newsletter/migrations/0011_update_contact.py +++ b/emencia/django/newsletter/migrations/0011_update_contact.py @@ -3,10 +3,11 @@ from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration from django.db import models, transaction +from django.conf import settings from city.models import City from country.models import Country -# from emencia.django.newsletter.models import Contact +from emencia.django.newsletter.models import Contact # from theme.models import Theme @@ -17,9 +18,9 @@ class Migration(DataMigration): # Note: Don't use "from appname.models import ModelName". # Use orm.ModelName to refer to models in this application, # and orm['appname.ModelName'] for models in other applications. - Contact = orm['newsletter.Contact'] - moscow = City.objects.language('ru').get(name=u'Москва').pk - russia = Country.objects.language('ru').get(name=u'Россия').pk + # Contact = orm['newsletter.Contact'] + moscow = settings.MOSCOW_PK + russia = settings.RUSSIA_PK r_cities = set(City.objects.filter(country_id=russia).values_list('pk', flat=True)) # with transaction.commit_manually(): for contact in Contact.objects.prefetch_related('contactsettings').all(): diff --git a/fabfile.py b/fabfile.py index 77947e82..8715e469 100644 --- a/fabfile.py +++ b/fabfile.py @@ -227,6 +227,11 @@ def t1580(): run('python manage.py migrate') run('python manage.py users_to_mailinglist') +@ticket +def mailing(): + with cd(REMOTE_HOME_DIR): + run('python manage.py migrate') + run('python manage.py newsletter_create_dailymail') # def stage3_pre_final(): # with cd(REMOTE_HOME_DIR):