Commit 355ed06b authored by Seb's avatar Seb
Browse files

Fix tests and old deps

parent acc454bc
...@@ -20,7 +20,7 @@ setup( ...@@ -20,7 +20,7 @@ setup(
install_requires=[ install_requires=[
'wagtail>=2.0', 'wagtail>=2.0',
'Django>=1.11', 'Django>=1.11',
'django-enumchoicefield==1.0.0', 'django-enumchoicefield==1.1.0',
], ],
extras_require={ extras_require={
'testing': [ 'testing': [
......
...@@ -315,8 +315,8 @@ class TestVideoChooserView(TestCase, WagtailTestUtils): ...@@ -315,8 +315,8 @@ class TestVideoChooserView(TestCase, WagtailTestUtils):
def test_simple(self): def test_simple(self):
response = self.get() response = self.get()
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.html') response_json = json.loads(response.content.decode())
self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.js') self.assertEqual(response_json['step'], 'chooser')
def test_search(self): def test_search(self):
response = self.get({'q': "Hello"}) response = self.get({'q': "Hello"})
...@@ -364,7 +364,8 @@ class TestVideoChooserChosenView(TestCase, WagtailTestUtils): ...@@ -364,7 +364,8 @@ class TestVideoChooserChosenView(TestCase, WagtailTestUtils):
def test_simple(self): def test_simple(self):
response = self.get() response = self.get()
self.assertEqual(response.status_code, 200) 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): class TestVideoChooserUploadView(TestCase, WagtailTestUtils):
...@@ -378,7 +379,8 @@ class TestVideoChooserUploadView(TestCase, WagtailTestUtils): ...@@ -378,7 +379,8 @@ class TestVideoChooserUploadView(TestCase, WagtailTestUtils):
response = self.get() response = self.get()
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtailvideos/chooser/chooser.html') 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): def test_upload(self):
response = self.client.post(reverse('wagtailvideos:chooser_upload'), { response = self.client.post(reverse('wagtailvideos:chooser_upload'), {
......
{% 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 %} <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> <script>
$(function() { $(function() {
...@@ -9,7 +15,11 @@ ...@@ -9,7 +15,11 @@
}); });
}); });
</script> </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"> <div class="row row-flush nice-padding">
...@@ -17,7 +27,15 @@ ...@@ -17,7 +27,15 @@
<form action="{% url 'wagtailvideos:edit' video.id %}" method="POST" enctype="multipart/form-data"> <form action="{% url 'wagtailvideos:edit' video.id %}" method="POST" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<ul class="fields"> <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> <li>
<input type="submit" class="button" value="{% trans 'Save' %}" /> {% if user_can_delete %} <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 %} <a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a> {% endif %}
...@@ -48,7 +66,9 @@ ...@@ -48,7 +66,9 @@
<h3 class="label">Create transcode</h3> <h3 class="label">Create transcode</h3>
<form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST"> <form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST">
<ul class="fields"> <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> <li>
<input class="button" type='submit' value="Start" /> <input class="button" type='submit' value="Start" />
</li> </li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% block chooser_class %}image-chooser{% endblock %} {% block chooser_class %}image-chooser{% endblock %}
{% block chosen_state_view %} {% block chosen_state_view %}
<div class="video-thumb"> <div class="preview-image">
{% if video and video.thumbnail %} {% if video and video.thumbnail %}
<img src='{{video.thumbnail.url}}' width="165" height="165" class="show-transparency"> <img src='{{video.thumbnail.url}}' width="165" height="165" class="show-transparency">
{% else %} {% else %}
......
import json
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from django.urls import reverse from django.urls import reverse
from wagtail.admin.forms.search import SearchForm from wagtail.admin.forms.search import SearchForm
...@@ -119,8 +117,10 @@ def chooser_upload(request): ...@@ -119,8 +117,10 @@ def chooser_upload(request):
search_index.insert_or_update_object(video) search_index.insert_or_update_object(video)
return render_modal_workflow( return render_modal_workflow(
request, None, 'wagtailvideos/chooser/video_chosen.js', request, None, json_data={
{'video_json': get_video_json(video)} 'step': 'video_chosen',
'result': get_video_json(video)
}
) )
else: else:
form = VideoForm() form = VideoForm()
...@@ -129,6 +129,7 @@ def chooser_upload(request): ...@@ -129,6 +129,7 @@ def chooser_upload(request):
paginator, videos = paginate(request, videos, per_page=12) paginator, videos = paginate(request, videos, per_page=12)
return render_modal_workflow( return render_modal_workflow(
request, 'wagtailvideos/chooser/chooser.html', 'wagtailvideos/chooser/chooser.js', request, 'wagtailvideos/chooser/chooser.html', None,
{'videos': videos, 'uploadform': form, 'searchform': searchform} template_vars={'videos': videos, 'uploadform': form, 'searchform': searchform},
json_data=get_chooser_js_data()
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment