diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c665c2..842434f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,12 +16,12 @@ head: before_script: - pip install . - -lts_52: - image: python:3.11 - extends: .python_test - before_script: - - pip install . wagtail~=5.2 django~=4.2 +# Bring back with next LTS (6.3) +# lts_52: +# image: python:3.11 +# extends: .python_test +# before_script: +# - pip install . wagtail~=5.2 django~=4.2 flake8: stage: lint diff --git a/README.rst b/README.rst index 555eeb6..653f892 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ html5 compliant codec using ffmpeg. Requirements ------------ -- Wagtail >= 5.2 (for older wagtail version see the tags) +- Wagtail >= 6.2 (for older wagtail version see the tags) - `ffmpeg `__ (optional, for transcoding) Installing diff --git a/setup.py b/setup.py index d71647a..46b4618 100755 --- a/setup.py +++ b/setup.py @@ -10,14 +10,14 @@ setup( name="wagtailvideos", - version="6.1.2", + version="7.0.0", description="A wagtail module for uploading and displaying videos in various codecs.", long_description=readme, author="Neon Jungle", author_email="developers@neonjungle.studio", url="https://github.com/neon-jungle/wagtailvideos", install_requires=[ - "wagtail>=5.2", + "wagtail>=6.1", "Django>=3.2", "bcp47==0.0.4", "wagtail-modeladmin>=2.0.0" diff --git a/wagtailvideos/views/multiple.py b/wagtailvideos/views/multiple.py index ba83fa7..90c496f 100644 --- a/wagtailvideos/views/multiple.py +++ b/wagtailvideos/views/multiple.py @@ -6,6 +6,7 @@ from django.views.decorators.vary import vary_on_headers from wagtail.admin.auth import PermissionPolicyChecker from wagtail.search.backends import get_search_backends + from wagtailvideos import get_video_model from wagtailvideos.forms import get_video_form from wagtailvideos.permissions import permission_policy diff --git a/wagtailvideos/views/videos.py b/wagtailvideos/views/videos.py index e12d240..407441e 100644 --- a/wagtailvideos/views/videos.py +++ b/wagtailvideos/views/videos.py @@ -4,12 +4,10 @@ from django.urls import reverse from django.utils.translation import gettext as _ from django.views.decorators.http import require_POST -from django.views.decorators.vary import vary_on_headers from wagtail.admin import messages from wagtail.admin.auth import PermissionPolicyChecker -from wagtail.admin.forms.search import SearchForm -from wagtail.admin.models import popular_tags_for_model -from wagtail.models import Collection +from wagtail.admin.filters import BaseMediaFilterSet +from wagtail.admin.views import generic from wagtail.search.backends import get_search_backends from wagtail_modeladmin.helpers import AdminURLHelper @@ -17,9 +15,6 @@ get_transcoder_backend, get_video_model, is_modeladmin_installed) from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form from wagtailvideos.permissions import permission_policy -from wagtail.admin.views import generic -from wagtail.admin.filters import BaseMediaFilterSet -from wagtailvideos.permissions import permission_policy permission_checker = PermissionPolicyChecker(permission_policy) @@ -37,7 +32,6 @@ class Meta: class IndexView(generic.IndexView): context_object_name = "videos" - # permission_policy = TODO model = Video filterset_class = VideoFilterSet permission_policy = permission_policy @@ -62,7 +56,8 @@ def get_filterset_kwargs(self): return kwargs def get_paginate_by(self, queryset): - return 32 # 4 x 8 + return 32 # 4 x 8 + @permission_checker.require('change') def edit(request, video_id):