Added support for newer Django Filer installs (#410)

divio · Jun 29, 2016 · d6ae89f · d6ae89f
1 parent 2887897
commit d6ae89f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,8 @@ CHANGELOG
 
 * Updated translation setup for transifex
 * Fixed bootstrap3 article template sometimes causing broken pages
+* Added support for cache durations fields in "time-sensitive" plugins on django CMS 3.3.0+
+* Added support for newer versions of django-filer
 
 
 1.2.2 (2016-05-19)

diff --git a/aldryn_newsblog/__init__.py b/aldryn_newsblog/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import unicode_literals
 
-__version__ = '1.2.2'
+__version__ = '1.2.3.pre1'
 
 
 default_app_config = 'aldryn_newsblog.apps.AldrynNewsBlog'
diff --git a/aldryn_newsblog/boilerplates/bootstrap3/templates/aldryn_newsblog/includes/article.html b/aldryn_newsblog/boilerplates/bootstrap3/templates/aldryn_newsblog/includes/article.html
@@ -6,7 +6,7 @@
             {% if not detail_view %}
                 <a href="{{ article.get_absolute_url }}">
             {% endif %}
-            <img src="{% thumbnail article.featured_image.image 800x450 crop subject_location=article.featured_image.subject_location %}" alt="{{ article.featured_image.alt }}" class="img-responsive">
+            <img src="{% thumbnail article.featured_image 800x450 crop subject_location=article.featured_image.subject_location %}" alt="{{ article.featured_image.alt }}" class="img-responsive">
             {% if not detail_view %}
                 </a>
             {% endif %}

diff --git a/aldryn_newsblog/templates/aldryn_newsblog/includes/article.html b/aldryn_newsblog/templates/aldryn_newsblog/includes/article.html
@@ -7,7 +7,7 @@
     {# The image is only shown on the detail view by using the condition "and detail_view" #}
     {% if article.featured_image_id and detail_view %}
         <p>
-            <img src="{% thumbnail article.featured_image.image 800x450 crop subject_location=article.featured_image.subject_location %}" alt="{{ article.featured_image.alt }}">
+            <img src="{% thumbnail article.featured_image 800x450 crop subject_location=article.featured_image.subject_location %}" alt="{{ article.featured_image.alt }}">
         </p>
     {% endif %}
 

diff --git a/tox.ini b/tox.ini
@@ -26,11 +26,6 @@ deps =
     py26: ordereddict
     py26: django-filer<=1.1.1
 
-    py27: django-filer<=1.2.0
-    py33: django-filer<=1.2.0
-    py34: django-filer<=1.2.0
-    py35: django-filer<=1.2.0
-
     dj16: -rtest_requirements/django-1.6.txt
     dj17: -rtest_requirements/django-1.7.txt
     dj18: -rtest_requirements/django-1.8.txt