Merge pull request #50 from thomasina-lee/master

replace TEMPLATE_DEBUG in templatetag fb_version

Author: smacker

filebrowser/static/filebrowser/img/test_not_an_image.jpg

@@ -45,7 +45,7 @@ def render(self, context):
             else:
                 return version.url
         except Exception:
-            if settings.TEMPLATE_DEBUG:
+            if context.template.engine.debug:
                 raise
             if self.var_name:
                 context[self.var_name] = ""

filebrowser/templatetags/fb_versions.py

@@ -40,8 +40,10 @@ def setUp(self):
 
         self.STATIC_IMG_PATH = os.path.join(settings.BASE_DIR, 'filebrowser', "static", "filebrowser", "img", "testimage.jpg")
         self.STATIC_IMG_BAD_NAME_PATH = os.path.join(settings.BASE_DIR, 'filebrowser', "static", "filebrowser", "img", "TEST_IMAGE_000.jpg")
+        self.STATIC_IMG_BAD_PATH = os.path.join(settings.BASE_DIR, 'filebrowser', "static", "filebrowser", "img", "test_not_an_image.jpg")
 
         self.F_IMAGE = FileObject(os.path.join(DIRECTORY, 'folder', "testimage.jpg"), site=site)
+        self.F_IMAGE_BAD = FileObject(os.path.join(DIRECTORY, 'folder', "test_not_an_image.jpg"), site=site)
         self.F_MISSING = FileObject(os.path.join(DIRECTORY, 'folder', "missing.jpg"), site=site)
         self.F_FOLDER = FileObject(os.path.join(DIRECTORY, 'folder'), site=site)
         self.F_SUBFOLDER = FileObject(os.path.join(DIRECTORY, 'folder', 'subfolder'), site=site)

tests/base.py

@@ -361,6 +361,7 @@ class VersionObjectTemplateTagTests(TestCase):
     def setUp(self):
         super(VersionObjectTemplateTagTests, self).setUp()
         shutil.copy(self.STATIC_IMG_PATH, self.FOLDER_PATH)
+        shutil.copy(self.STATIC_IMG_BAD_PATH, self.FOLDER_PATH)
 
         os.makedirs(self.PLACEHOLDER_PATH)
         shutil.copy(self.STATIC_IMG_PATH, self.PLACEHOLDER_PATH)
@@ -408,6 +409,13 @@ def test_non_existing_path(self):
         self.assertEqual(c["version_large"].url, os.path.join(settings.MEDIA_URL, ""))
         self.assertEqual(r, os.path.join(settings.MEDIA_URL, ""))
 
+    def test_jpg_not_an_image(self):
+        t = Template('{% load fb_versions %}{% version obj "large" as version_large %}{{ version_large.url }}')
+        c = Context({"obj": self.F_IMAGE_BAD})
+        r = t.render(c)
+        self.assertEqual(c["version_large"], "")
+        self.assertEqual(r, "")
+
     @patch('filebrowser.templatetags.fb_versions.SHOW_PLACEHOLDER', True)
     @patch('filebrowser.templatetags.fb_versions.FORCE_PLACEHOLDER', True)
     def test_force_with_existing_image(self):