More editing fixes WIP

wagtailvideos/models.py

@@ -15,7 +15,6 @@ from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
-from django.utils.six import StringIO
 from django.utils.translation import ugettext_lazy as _
 from taggit.managers import TaggableManager
 from unidecode import unidecode
@@ -26,7 +25,7 @@ from wagtail.wagtailsearch import index
 from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
 
 
-class ImageQuerySet(SearchableQuerySetMixin, models.QuerySet):
+class VideoQuerySet(SearchableQuerySetMixin, models.QuerySet):
     pass
 
 
@@ -51,7 +50,7 @@ class AbstractVideo(CollectionMember, TagSearchable):
 
     file_size = models.PositiveIntegerField(null=True, editable=False)
 
-    objects = ImageQuerySet.as_manager()
+    objects = VideoQuerySet.as_manager()
 
     def is_stored_locally(self):
         """

wagtailvideos/templates/wagtailvideos/videos/_file_field.html

 {% extends "wagtailadmin/shared/field.html" %}
 {% load i18n wagtailimages_tags %}
 {% block form_field %}
-	{% image image original as original_image %}
+	<img src='{{video.thumbnail.url}}' />
 
-    <a href="{{ original_image.url }}" class="icon icon-image">{{ image.filename }}</a> ({{ original_image.width }}x{{ original_image.height}})<br /><br />
+    <a href="{{ original_image.url }}" class="icon icon-image">{{ video.filename }}</a><br /><br />
 
     {% trans "Change image file:" %}
     {{ field }}

wagtailvideos/templates/wagtailvideos/videos/_file_field_as_li.html

 {% load wagtailadmin_tags %}
 <li class="{% if field.field.required %}required{% endif %} {{ wrapper_classes }} {{ li_classes }} {% if field.errors %}error{% endif %}">
-    {% include "wagtailimages/images/_file_field.html" %}
-</li>
\ No newline at end of file
+    {% include "wagtailvideos/videos/_file_field.html" %}
+</li>

wagtailvideos/templates/wagtailvideos/videos/edit.html

@@ -28,7 +28,7 @@
                     {% for field in form %}
 
                         {% if field.name == 'file' %}
-                            {% include "wagtailimages/images/_file_field_as_li.html" %}
+                            {% include "wagtailvideos/videos/_file_field_as_li.html" %}
                         {% elif field.is_hidden %}
                             {{ field }}
                         {% else %}

wagtailvideos/views/videos.py

@@ -46,13 +46,14 @@ def index(request):
 
     # Create response
     if request.is_ajax():
-        return render(request, 'wagtailvideos/videos/results.html', {
+        response = render(request, 'wagtailvideos/videos/results.html', {
             'vidoes': videos,
             'query_string': query_string,
             'is_searching': bool(query_string),
         })
+        return response
     else:
-        return render(request, 'wagtailvideos/videos/index.html', {
+        response = render(request, 'wagtailvideos/videos/index.html', {
             'videos': videos,
             'query_string': query_string,
             'is_searching': bool(query_string),
@@ -61,6 +62,7 @@ def index(request):
             'popular_tags': Video.popular_tags(),
             'current_collection': current_collection,
         })
+        return response
 
 
 def edit(request, video_id):
@@ -82,7 +84,9 @@ def edit(request, video_id):
                 # Set new image file size
                 video.file_size = video.file.size
 
-            form.save()
+            video = form.save()
+            video.thumbnail = video.get_thumbnail()
+            video.save()
 
             # Reindex the image to make sure all tags are indexed
             for backend in get_search_backends():