diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
index 4b21fd3c0..cb049d0e8 100644
--- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
+++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py
@@ -65,6 +65,14 @@ def fieldtype(bound_field):
return ""
+@register.filter
+def widgettype(bound_field):
+ try:
+ return camelcase_to_underscore(bound_field.field.widget.__class__.__name__)
+ except AttributeError:
+ return ""
+
+
@register.filter
def meta_description(model):
try:
diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py
index 873780cdf..65c710e05 100644
--- a/wagtail/wagtailadmin/views/pages.py
+++ b/wagtail/wagtailadmin/views/pages.py
@@ -255,6 +255,8 @@ def edit(request, page_id):
page = get_object_or_404(Page, id=page_id).get_latest_revision_as_page()
parent = page.get_parent()
+ content_type = ContentType.objects.get_for_model(page)
+
page_perms = page.permissions_for_user(request.user)
if not page_perms.can_edit():
raise PermissionDenied
@@ -373,6 +375,7 @@ def edit(request, page_id):
return render(request, 'wagtailadmin/pages/edit.html', {
'page': page,
+ 'content_type': content_type,
'edit_handler': edit_handler,
'errors_debug': errors_debug,
'preview_modes': page.preview_modes,
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html
index 13ba6a819..3df57ae30 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html
@@ -1,7 +1,7 @@
-{% extends "wagtailadmin/shared/field_as_li.html" %}
+{% extends "wagtailadmin/shared/field.html" %}
{% load i18n %}
{% block form_field %}
-
{{ document.file }}
+
{{ document.filename }}
{% trans "Change document:" %}
{{ field }}
{% endblock %}
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field_as_li.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field_as_li.html
new file mode 100644
index 000000000..0911fc998
--- /dev/null
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field_as_li.html
@@ -0,0 +1,4 @@
+{% load wagtailadmin_tags %}
+
+ {% include "wagtaildocs/documents/_file_field.html" %}
+
\ No newline at end of file
diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
index 62b9df514..9897b41eb 100644
--- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
+++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
@@ -15,20 +15,32 @@
{% trans "Editing" as editing_str %}
{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=document.title icon="doc-full-inverse" usage_object=document %}
-
-
+
+
+
+
+
+ {% if document.file %}
+ - {% trans "Filesize" %}
+ - {{ document.file.size|filesizeformat }}
+ {% endif %}
+
+
+
diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py
index 27eae6543..a544793fd 100644
--- a/wagtail/wagtailimages/models.py
+++ b/wagtail/wagtailimages/models.py
@@ -4,6 +4,7 @@ import re
from six import BytesIO, text_type
from taggit.managers import TaggableManager
+from willow.image import Image as WillowImage
from django.core.files import File
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
@@ -80,6 +81,19 @@ class AbstractImage(models.Model, TagSearchable):
def __str__(self):
return self.title
+ def get_willow_image(self):
+ try:
+ image_file = self.file.file # triggers a call to self.storage.open, so IOErrors from missing files will be raised at this point
+ except IOError as e:
+ # re-throw this as a SourceImageIOError so that calling code can distinguish
+ # these from IOErrors elsewhere in the process
+ raise SourceImageIOError(text_type(e))
+
+ image_file.open('rb')
+ image_file.seek(0)
+
+ return WillowImage.open(image_file)
+
def get_rect(self):
return Rect(0, 0, self.width, self.height)
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html b/wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html
index ef61bdacb..4f1d62903 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html
@@ -1,8 +1,10 @@
-{% extends "wagtailadmin/shared/field_as_li.html" %}
-{% load i18n %}
+{% extends "wagtailadmin/shared/field.html" %}
+{% load i18n wagtailimages_tags %}
{% block form_field %}
-
{{ image.filename }}
+ {% image image original as original_image %}
- {% trans "Change image:" %}
+
{{ image.filename }} ({{ original_image.width }}x{{ original_image.height}})
+
+ {% trans "Change image file:" %}
{{ field }}
{% endblock %}
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/_file_field_as_li.html b/wagtail/wagtailimages/templates/wagtailimages/images/_file_field_as_li.html
new file mode 100644
index 000000000..bce019852
--- /dev/null
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/_file_field_as_li.html
@@ -0,0 +1,4 @@
+{% load wagtailadmin_tags %}
+
+ {% include "wagtailimages/images/_file_field.html" %}
+
\ No newline at end of file
diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
index cd36f9f5c..dd31a1ba5 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html
@@ -28,14 +28,14 @@
-
+
-
+
{% trans "Focal point (optional)" %}
{% trans "To define this image's most important region, drag a box over the image below." %} {% if image.focal_point %}({% trans "Current focal point shown" %}){% endif %}
@@ -64,10 +64,22 @@
-
+
+
+
{% if url_generator_enabled %}
{% trans "URL Generator" %}
+
{% endif %}
+
+ {% image image original as original_image %}
+
+
+ - {% trans "Max dimensions" %}
+ - {{ original_image.width }}x{{ original_image.height }}
+ - {% trans "Filesize" %}
+ - {{ image.file.size|filesizeformat }}
+
{% endblock %}
diff --git a/wagtail/wagtailimages/tests/test_models.py b/wagtail/wagtailimages/tests/test_models.py
index 059653681..0d5455840 100644
--- a/wagtail/wagtailimages/tests/test_models.py
+++ b/wagtail/wagtailimages/tests/test_models.py
@@ -1,4 +1,5 @@
import unittest
+from willow.image import Image as WillowImage
from django.test import TestCase
from django.core.urlresolvers import reverse
@@ -13,7 +14,7 @@ from django.db import connection
from wagtail.tests.utils import WagtailTestUtils, test_concurrently
from wagtail.wagtailcore.models import Page
from wagtail.tests.models import EventPage, EventPageCarouselItem
-from wagtail.wagtailimages.models import Rendition, Filter
+from wagtail.wagtailimages.models import Rendition, Filter, SourceImageIOError
from wagtail.wagtailimages.backends import get_image_backend
from wagtail.wagtailimages.backends.pillow import PillowBackend
from wagtail.wagtailimages.rect import Rect
@@ -268,6 +269,29 @@ class TestGetUsage(TestCase):
self.assertTrue(issubclass(Page, type(self.image.get_usage()[0])))
+class TestGetWillowImage(TestCase):
+ fixtures = ['test.json']
+
+ def setUp(self):
+ self.image = Image.objects.create(
+ title="Test image",
+ file=get_test_image_file(),
+ )
+
+ def test_willow_image_object_returned(self):
+ willow_image = self.image.get_willow_image()
+
+ self.assertIsInstance(willow_image, WillowImage)
+
+ def test_with_missing_image(self):
+ # Image id=1 in test fixtures has a missing image file
+ bad_image = Image.objects.get(id=1)
+
+ # Attempting to get the Willow image for images without files
+ # should raise a SourceImageIOError
+ self.assertRaises(SourceImageIOError, bad_image.get_willow_image)
+
+
class TestIssue573(TestCase):
"""
This tests for a bug which causes filename limit on Renditions to be reached