Merged from newsletter

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()

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:

templates/client/popups/announces.html

@@ -12,7 +12,7 @@
 
                     <div class="pwf-line mail">
                         <div class="pwf-field">{{ announce_subscribe.email }}</div>
-                        <div class="pwf-msg"><a href="#">Пример рассылки</a></div>
+                        <div class="pwf-msg"><a target="_blank" href="/newsletters/test-letter/">Пример рассылки</a></div>
                     </div>
 
                     <div class="pwf-line country">