Fix tests and old deps

setup.py

@@ -20,7 +20,7 @@ setup(
     install_requires=[
         'wagtail>=2.0',
         'Django>=1.11',
-        'django-enumchoicefield==1.0.0',
+        'django-enumchoicefield==1.1.0',
     ],
     extras_require={
         'testing': [

tests/test_admin_views.py

@@ -315,8 +315,8 @@ class TestVideoChooserView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.get()
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.html')
-        self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.js')
+        response_json = json.loads(response.content.decode())
+        self.assertEqual(response_json['step'], 'chooser')
 
     def test_search(self):
         response = self.get({'q': "Hello"})
@@ -364,7 +364,8 @@ class TestVideoChooserChosenView(TestCase, WagtailTestUtils):
     def test_simple(self):
         response = self.get()
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'wagtailvideos/chooser/video_chosen.js')
+        response_json = json.loads(response.content.decode())
+        self.assertEqual(response_json['step'], 'video_chosen')
 
 
 class TestVideoChooserUploadView(TestCase, WagtailTestUtils):
@@ -378,7 +379,8 @@ class TestVideoChooserUploadView(TestCase, WagtailTestUtils):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.html')
-        self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.js')
+        response_json = json.loads(response.content.decode())
+        self.assertEqual(response_json['step'], 'chooser')
 
     def test_upload(self):
         response = self.client.post(reverse('wagtailvideos:chooser_upload'), {

wagtailvideos/templates/wagtailvideos/videos/edit.html

-{% extends "wagtailadmin/base.html" %} {% load staticfiles wagtailadmin_tags i18n wagtailvideos_tags %} {% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %} {% block extra_css %}
+{% extends "wagtailadmin/base.html" %}
+
+{% load staticfiles wagtailadmin_tags i18n wagtailvideos_tags %}
+
+{% block titletag %}{% blocktrans with title=video.title %}Editing video {{ title }}{% endblocktrans %}{% endblock %}
+
+{% block extra_css %}
 <link rel="stylesheet" href="{% static 'wagtailvideos/css/edit-video.css' %}" type="text/css" /> {% endblock %} {% block extra_js %} {{ block.super }} {% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
 <script>
     $(function() {
@@ -9,7 +15,11 @@
         });
     });
 </script>
-{% endblock %} {% block content %} {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" %}
+{% endblock %}
+{% block content %}
+{% trans "Editing" as editing_str %}
+
+{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=video.title icon="media" %}
 
 <div class="row row-flush nice-padding">
 
@@ -17,7 +27,15 @@
         <form action="{% url 'wagtailvideos:edit' video.id %}" method="POST" enctype="multipart/form-data">
             {% csrf_token %}
             <ul class="fields">
-                {% for field in form %} {% if field.name == 'file' %} {% include "wagtailvideos/videos/_file_field_as_li.html" %} {% elif field.is_hidden %} {{ field }} {% else %} {% include "wagtailadmin/shared/field_as_li.html" %} {% endif %} {% endfor %}
+                {% for field in form %}
+                  {% if field.name == 'file' %}
+                    {% include "wagtailvideos/videos/_file_field_as_li.html" %}
+                  {% elif field.is_hidden %}
+                    {{ field }}
+                  {% else %}
+                    {% include "wagtailadmin/shared/field_as_li.html" %}
+                  {% endif %}
+                  {% endfor %}
                 <li>
                     <input type="submit" class="button" value="{% trans 'Save' %}" /> {% if user_can_delete %}
                     <a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a> {% endif %}
@@ -48,7 +66,9 @@
             <h3 class="label">Create transcode</h3>
             <form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST">
                 <ul class="fields">
-                    {% csrf_token %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality %}
+                    {% csrf_token %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format %}
+                    {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality %}
                     <li>
                         <input class="button" type='submit' value="Start" />
                     </li>

wagtailvideos/templates/wagtailvideos/widgets/video_chooser.html

@@ -3,7 +3,7 @@
 {% block chooser_class %}image-chooser{% endblock %}
 
 {% block chosen_state_view %}
-    <div class="video-thumb">
+    <div class="preview-image">
         {% if video and video.thumbnail %}
             <img src='{{video.thumbnail.url}}' width="165" height="165" class="show-transparency">
         {% else %}

wagtailvideos/views/chooser.py

-import json
-
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from wagtail.admin.forms.search import SearchForm
@@ -119,8 +117,10 @@ def chooser_upload(request):
             search_index.insert_or_update_object(video)
 
             return render_modal_workflow(
-                request, None, 'wagtailvideos/chooser/video_chosen.js',
-                {'video_json': get_video_json(video)}
+                request, None, json_data={
+                    'step': 'video_chosen',
+                    'result': get_video_json(video)
+                }
             )
     else:
         form = VideoForm()
@@ -129,6 +129,7 @@ def chooser_upload(request):
     paginator, videos = paginate(request, videos, per_page=12)
 
     return render_modal_workflow(
-        request, 'wagtailvideos/chooser/chooser.html', 'wagtailvideos/chooser/chooser.js',
-        {'videos': videos, 'uploadform': form, 'searchform': searchform}
+        request, 'wagtailvideos/chooser/chooser.html', None,
+        template_vars={'videos': videos, 'uploadform': form, 'searchform': searchform},
+        json_data=get_chooser_js_data()
     )