Commit 8d48fee7 authored by Liam Brenner's avatar Liam Brenner
Browse files

iSort all the things

parent 7c9591bb
...@@ -9,9 +9,10 @@ from django.core.urlresolvers import reverse ...@@ -9,9 +9,10 @@ from django.core.urlresolvers import reverse
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from mock import patch from mock import patch
from tests.utils import create_test_video_file
from wagtail.tests.utils import WagtailTestUtils from wagtail.tests.utils import WagtailTestUtils
from wagtail.wagtailcore.models import Collection, GroupCollectionPermission from wagtail.wagtailcore.models import Collection, GroupCollectionPermission
from tests.utils import create_test_video_file
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
...@@ -7,6 +7,7 @@ from enumchoicefield.forms import EnumField ...@@ -7,6 +7,7 @@ from enumchoicefield.forms import EnumField
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) BaseCollectionMemberForm, collection_member_permission_formset_factory)
from wagtailvideos.fields import WagtailVideoField from wagtailvideos.fields import WagtailVideoField
from wagtailvideos.models import MediaFormats, Video, VideoQuality from wagtailvideos.models import MediaFormats, Video, VideoQuality
from wagtailvideos.permissions import \ from wagtailvideos.permissions import \
......
...@@ -27,6 +27,7 @@ from wagtail.wagtailadmin.utils import get_object_usage ...@@ -27,6 +27,7 @@ from wagtail.wagtailadmin.utils import get_object_usage
from wagtail.wagtailcore.models import CollectionMember from wagtail.wagtailcore.models import CollectionMember
from wagtail.wagtailsearch import index from wagtail.wagtailsearch import index
from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
from wagtailvideos.utils import ffmpeg_installed from wagtailvideos.utils import ffmpeg_installed
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -11,6 +11,7 @@ from wagtail.wagtailadmin.utils import ( ...@@ -11,6 +11,7 @@ from wagtail.wagtailadmin.utils import (
PermissionPolicyChecker, popular_tags_for_model) PermissionPolicyChecker, popular_tags_for_model)
from wagtail.wagtailcore.models import Collection from wagtail.wagtailcore.models import Collection
from wagtail.wagtailsearch import index as search_index from wagtail.wagtailsearch import index as search_index
from wagtailvideos.forms import get_video_form from wagtailvideos.forms import get_video_form
from wagtailvideos.models import Video from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
......
...@@ -14,6 +14,7 @@ from wagtail.wagtailadmin.utils import ( ...@@ -14,6 +14,7 @@ from wagtail.wagtailadmin.utils import (
PermissionPolicyChecker, popular_tags_for_model) PermissionPolicyChecker, popular_tags_for_model)
from wagtail.wagtailcore.models import Collection from wagtail.wagtailcore.models import Collection
from wagtail.wagtailsearch.backends import get_search_backends from wagtail.wagtailsearch.backends import get_search_backends
from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from wagtailvideos.models import Video from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
......
...@@ -8,10 +8,9 @@ from django.utils.translation import ugettext_lazy as _ ...@@ -8,10 +8,9 @@ from django.utils.translation import ugettext_lazy as _
from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore import hooks from wagtail.wagtailcore import hooks
from wagtailvideos import urls
from wagtailvideos.forms import GroupVideoPermissionFormSet from wagtailvideos.forms import GroupVideoPermissionFormSet
from . import urls
@hooks.register('register_admin_urls') @hooks.register('register_admin_urls')
def register_admin_urls(): def register_admin_urls():
......
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