Merge branch 'romanosipenko-master'

respondcreate · May 30, 2016 · 459d6dc · 459d6dc
2 parents 19962a5 + ef04d14
commit 459d6dc
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -7,12 +7,12 @@
 Welcome to django-versatileimagefield's documentation!
 ======================================================
 
-.. image:: https://travis-ci.org/WGBH/django-versatileimagefield.svg?branch=master
-    :target: https://travis-ci.org/WGBH/django-versatileimagefield
+.. image:: https://travis-ci.org/respondcreate/django-versatileimagefield.svg?branch=master
+    :target: https://travis-ci.org/respondcreate/django-versatileimagefield
     :alt: Travis CI Status
 
-.. image:: https://img.shields.io/coveralls/WGBH/django-versatileimagefield.svg?style=flat
-    :target: https://coveralls.io/r/WGBH/django-versatileimagefield
+.. image:: https://coveralls.io/repos/github/respondcreate/django-versatileimagefield/badge.svg?branch=master
+    :target: https://coveralls.io/github/respondcreate/django-versatileimagefield?branch=master
     :alt: Coverage Status
 
 .. image:: https://img.shields.io/pypi/dm/django-versatileimagefield.svg?style=flat

diff --git a/tests/serializers.py b/tests/serializers.py
@@ -10,9 +10,13 @@ class VersatileImageTestModelSerializer(ModelSerializer):
     image = VersatileImageFieldSerializer(
         sizes='test_set'
     )
+    optional_image = VersatileImageFieldSerializer(
+        sizes='test_set'
+    )
 
     class Meta:
         model = VersatileImageTestModel
         fields = (
             'image',
+            'optional_image',
         )
diff --git a/tests/tests.py b/tests/tests.py
@@ -392,6 +392,31 @@ def test_VersatileImageFieldSerializer_output(self):
                 )
             }
         )
+        self.assertEqual(
+            serializer.data.get('optional_image'),
+            {
+                'test_crop': (
+                    'http://testserver/media/__sized__/__placeholder__/placeholder-crop'
+                    '-c0-5__0-5-100x100.png'
+                ),
+                'test_invert_crop': (
+                    'http://testserver/media/__sized__/__placeholder__/__filtered__/placeholder__invert__'
+                    '-crop-c0-5__0-5-100x100.png'
+                ),
+                'test_invert_thumb': (
+                    'http://testserver/media/__sized__/__placeholder__/__filtered__/placeholder__invert__'
+                    '-thumbnail-100x100.png'
+                ),
+                'test_invert': (
+                    'http://testserver/media/__placeholder__/__filtered__/placeholder'
+                    '__invert__.png'
+                ),
+                'test_thumb': (
+                    'http://testserver/media/__sized__/__placeholder__/placeholder-thumbnail'
+                    '-100x100.png'
+                )
+            }
+        )        
 
     def test_widget_javascript(self):
         """

diff --git a/versatileimagefield/utils.py b/versatileimagefield/utils.py
@@ -245,7 +245,7 @@ def build_versatileimagefield_url_set(image_instance, size_set, request=None):
     """
     size_set = validate_versatileimagefield_sizekey_list(size_set)
     to_return = {}
-    if image_instance:
+    if image_instance or image_instance.field.placeholder_image:
         for key, image_key in size_set:
             img_url = get_url_from_image_key(image_instance, image_key)
             if request is not None: