diff --git a/emencia/django/newsletter/management/commands/fill_contacts.py b/emencia/django/newsletter/management/commands/fill_contacts.py index bf41bea4..9def8959 100644 --- a/emencia/django/newsletter/management/commands/fill_contacts.py +++ b/emencia/django/newsletter/management/commands/fill_contacts.py @@ -69,7 +69,7 @@ class Command(NoArgsCommand): db = MySQLdb.connect(host="localhost", user=settings.DATABASES['default']['USER'], passwd=settings.DATABASES['default']['PASSWORD'], - db="old_expomap", + db="old_db", charset='utf8', cursorclass=DictCursor) cursor = db.cursor() diff --git a/emencia/django/newsletter/managers.py b/emencia/django/newsletter/managers.py index 54caa7aa..ade35fca 100644 --- a/emencia/django/newsletter/managers.py +++ b/emencia/django/newsletter/managers.py @@ -16,11 +16,11 @@ class ContactManager(models.Manager): def valids(self): """Return only valid contacts""" - return self.get_query_set().filter(valid=True) + return self.get_query_set().filter(valid=True, activated=True) def valid_subscribers(self): """Return only valid subscribers""" - return self.subscribers().filter(valid=True) + return self.subscribers().filter(valid=True, activated=True) def activate(self, activation_key): try: diff --git a/templates/client/popups/announces.html b/templates/client/popups/announces.html index d7dc85ae..532016e7 100644 --- a/templates/client/popups/announces.html +++ b/templates/client/popups/announces.html @@ -12,7 +12,7 @@
{{ announce_subscribe.email }}
-
Пример рассылки
+
Пример рассылки