Merge branch 'master' of git.general-servers.com:expomap/expomap into develop

emencia/django/newsletter/mailer.py

@@ -381,10 +381,9 @@ class Mailer(NewsLetterSender):
             else:
                 announce_context = None
 
-            message = self.build_message(contact, announce_context)
             try:
                 if send:
-
+                    message = self.build_message(contact, announce_context)
                     self.smtp.sendmail(self.newsletter.header_sender,
                                            contact.email,
                                            message.as_string())

emencia/django/newsletter/management/commands/send_newsletter.py

@@ -23,10 +23,16 @@ class Command(NoArgsCommand):
         for newsletter in Newsletter.objects.exclude(
             status=Newsletter.DRAFT).exclude(status=Newsletter.SENT):
             mailer = Mailer(newsletter, verbose=verbose)
+
             if mailer.can_send:
-                if verbose:
-                    print 'Start emailing %s' % newsletter.title
+
+                #if verbose:
+                #    with open('/tmp/cron.log', 'a') as f:f.write('Start emailing %s\n' % newsletter.title)
+                #    print 'Start emailing %s' % newsletter.title
+
                 mailer.run()
 
+
+
         if verbose:
             print 'End session sending'

emencia/django/newsletter/views/admin_views.py

@@ -273,7 +273,8 @@ class NewsletterStatistics(DetailView):
         sent = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.SENT).count()
         errors = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.ERROR).count()
         opened = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.OPENED).count()
-        unsubscribed = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.UNSUBSCRIPTION).count()
+        unsubscribed = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.UNSUBSCRIPTION).\
+            values_list('contact', flat=True).distinct().count()
         no_data = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.ANNOUNCE_NO_DATA).count()
         links = self.object.contactmailingstatus_set.filter(status=ContactMailingStatus.LINK_OPENED).count()
         CMS = ContactMailingStatus
@@ -390,4 +391,4 @@ class PopupStatisticsView(TemplateView):
             res = {'cnt':0, 'subscr':0, 'active':0}
         return self.render_to_response({'object':res})
 
-"""
+"""

proj/settings.py

@@ -428,6 +428,10 @@ LOGGING = {
 20 2,14 * * * /usr/bin/python /var/www/proj/manage.py banner_log_check_previous_day
 # update hotels prices
 20 1 * * 6 /usr/bin/python /var/www/proj/manage.py update_hotels_price
+# newsletter
+20 * * * * /usr/bin/python /var/www/proj/manage.py send_newsletter
+40 6 * * * /usr/bin/python /var/www/proj/manage.py newsletter_contacts_remove_notactivated
+
 """
 
 THUMBNAIL_DEBUG = DEBUG

templates/admin/newsletters/newsletter_list.html

@@ -36,7 +36,7 @@
                 <td><a href="{% url 'newsletters_newsletters_update' item.id %}">Изменить</a> </td>
 
                 <td><a href="{% url 'newsletters_newsletters_history' item.id %}">История</a> </td>
-                <td>{% if item.status == item.SENT or item.status == item.CANCELED %}<a href="{% url 'newsletters_newsletters_stat' item.id %}">Статистика</a>{% endif %}</td>
+                <td><a href="{% url 'newsletters_newsletters_stat' item.id %}">Статистика</a></td>
                 <td><a class="btn btn-close btn-round btn-danger" href="{% url 'newsletters_newsletters_delete' item.id %}"><i class="icon-remove"></i></a> </td>
             </tr>
             {% endfor %}

templates/client/accounts/user_events.html

@@ -6,7 +6,7 @@
 {% block bread_scrumbs %}
    <div class="bread-crumbs">
        <a href="/">{% trans 'Главная страница' %}</a>
-       <a href="/user/{{ u.url }}">{{ u.get_full_name }}</a>
+       <a href="/{{ u.url }}/">{{ u.get_full_name }}</a>
         <strong>{{ event_type }}</strong>
    </div>
 {% endblock %}

templates/client/includes/conference/conference_object.html

@@ -19,10 +19,10 @@
 				</div>
 				<div class="i-stats">
 					{% if event.visitors %}
-					<span class="visitors" title="Посетители">{{ event.visitors }}</span>
+					<span class="visitors" title="{% trans 'Посетители' %}">{{ event.visitors }}</span>
 					{% endif %}
 					{% if event.members %}
-					<span class="participants" title="Участники">{{ event.members }}</span>
+					<span class="participants" title="{% trans 'Участники' %}">{{ event.members }}</span>
 					{% endif %}
 				</div>
 				<div class="i-discount">

templates/client/includes/exposition/exposition_object.html

@@ -21,10 +21,10 @@
 				</div>
 				<div class="i-stats">
 					{% if exposition.visitors %}
-					<span class="visitors" title="Посетители">{{ exposition.visitors }}</span>
+					<span class="visitors" title="{% trans 'Посетители' %}">{{ exposition.visitors }}</span>
 					{% endif %}
 					{% if exposition.members %}
-					<span classlinkebreaksbr="participants" title="Участники">{{ exposition.members }}</span>
+					<span class="participants" title="{% trans 'Участники' %}">{{ exposition.members }}</span>
 					{% endif %}
 				</div>
 				<div class="i-discount">