Commit fc0f8eed authored by Seb's avatar Seb
Browse files

Fix for wagtail 1.5, can now upload videos

parent 472b4bd8
...@@ -2,12 +2,18 @@ from django import forms ...@@ -2,12 +2,18 @@ from django import forms
from django.forms.models import modelform_factory from django.forms.models import modelform_factory
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from wagtail.wagtailadmin import widgets from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.forms import \ from wagtail.wagtailadmin.forms import (BaseCollectionMemberForm,
collection_member_permission_formset_factory collection_member_permission_formset_factory)
from wagtailvideos.fields import WagtailVideoField from wagtailvideos.fields import WagtailVideoField
from wagtailvideos.formats import get_video_formats from wagtailvideos.formats import get_video_formats
from wagtailvideos.models import Video from wagtailvideos.models import Video
from wagtailvideos.permissions import \
permission_policy as video_permission_policy
class BaseVideoForm(BaseCollectionMemberForm):
permission_policy = video_permission_policy
# Callback to allow us to override the default form field for the image file field # Callback to allow us to override the default form field for the image file field
def formfield_for_dbfield(db_field, **kwargs): def formfield_for_dbfield(db_field, **kwargs):
...@@ -26,10 +32,12 @@ def get_video_form(model): ...@@ -26,10 +32,12 @@ def get_video_form(model):
# cause dubious results when multiple collections exist (e.g adding the # cause dubious results when multiple collections exist (e.g adding the
# document to the root collection where the user may not have permission) - # document to the root collection where the user may not have permission) -
# and when only one collection exists, it will get hidden anyway. # and when only one collection exists, it will get hidden anyway.
print('collection not found')
fields = list(fields) + ['collection'] fields = list(fields) + ['collection']
return modelform_factory( return modelform_factory(
model, model,
form=BaseVideoForm,
fields=fields, fields=fields,
formfield_callback=formfield_for_dbfield, formfield_callback=formfield_for_dbfield,
# set the 'file' widget to a FileInput rather than the default ClearableFileInput # set the 'file' widget to a FileInput rather than the default ClearableFileInput
...@@ -38,10 +46,6 @@ def get_video_form(model): ...@@ -38,10 +46,6 @@ def get_video_form(model):
widgets={ widgets={
'tags': widgets.AdminTagWidget, 'tags': widgets.AdminTagWidget,
'file': forms.FileInput(), 'file': forms.FileInput(),
'focal_point_x': forms.HiddenInput(attrs={'class': 'focal_point_x'}),
'focal_point_y': forms.HiddenInput(attrs={'class': 'focal_point_y'}),
'focal_point_width': forms.HiddenInput(attrs={'class': 'focal_point_width'}),
'focal_point_height': forms.HiddenInput(attrs={'class': 'focal_point_height'}),
}) })
......
...@@ -5,6 +5,7 @@ import json ...@@ -5,6 +5,7 @@ import json
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from wagtail.wagtailadmin.widgets import AdminChooser from wagtail.wagtailadmin.widgets import AdminChooser
from wagtailvideos.models import get_video_model from wagtailvideos.models import get_video_model
......
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