diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index 29ced6c5..1872ba4f 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -292,6 +292,10 @@ class NewsLetterSender(object): self.newsletter.mails_sent() >= \ self.newsletter.mailing_list.expedition_set().count(): self.newsletter.status = Newsletter.SENT + + if self.announce and not self.expedition_list: + self.newsletter.status = Newsletter.SENT + self.newsletter.save() @property diff --git a/proj/urls.py b/proj/urls.py index dd4d976c..4fc72346 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -73,6 +73,12 @@ urlpatterns = patterns('', url(r'^', include('service.urls')), ) if settings.DEBUG: + urlpatterns += patterns( + 'django.views.static', + (r'media/(?P.*)', + 'serve', + {'document_root': settings.MEDIA_ROOT}), ) + import debug_toolbar urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)), diff --git a/templates/client/article/news.html b/templates/client/article/news.html index 8bd86a60..f562eca8 100644 --- a/templates/client/article/news.html +++ b/templates/client/article/news.html @@ -55,7 +55,7 @@

{{ news.main_title }}

-

{{ news.preview }}

+

{{ news.preview|safe }}

{{ news.publish_date|date:"d E Y" }}{% if news.get_event %}{{ news.get_event.name }}<{% endif %}
diff --git a/templates/client/includes/exposition/photo.html b/templates/client/includes/exposition/photo.html index a21e8a3a..0c87e741 100644 --- a/templates/client/includes/exposition/photo.html +++ b/templates/client/includes/exposition/photo.html @@ -61,7 +61,11 @@ {% include 'client/popups/photo.html' %} {% endblock %} {% block scripts %} +{% comment %} +{% endcomment %} + +