From 73ed68aa8d661db9edd6cbc367343b95f2207911 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin Date: Thu, 24 Oct 2024 12:10:56 +0200 Subject: [PATCH 01/51] * UPGRADE Django to v4.2.16 * Upgrade securtity dependances * Remove deprecated django-tagging * Add new django-tagulous * Elasticsearch default version is Now 8 (remove compatibility with ES 6) * Replace deprecated ugettext_lazy by gettext_lazy * Add some temporary deprecations Hacks for cas-client & Chunked-upload * Replace deprecated url() by re_path() * Disable all Pods apps by default * Correct error handling for ElasticSearch --- pod/ai_enhancement/forms.py | 4 +- pod/ai_enhancement/utils.py | 4 +- pod/authentication/admin.py | 2 +- pod/authentication/forms.py | 2 +- pod/authentication/models.py | 2 +- pod/authentication/tests/test_views.py | 2 +- pod/authentication/urls.py | 12 +-- pod/authentication/views.py | 2 +- pod/chapter/urls.py | 4 +- pod/completion/admin.py | 2 +- pod/completion/forms.py | 2 - pod/completion/models.py | 2 +- pod/completion/tests/test_models.py | 2 +- pod/completion/tests/test_views.py | 2 +- pod/completion/urls.py | 16 +-- pod/completion/views.py | 47 ++++----- pod/cut/context_processors.py | 2 +- pod/cut/models.py | 2 +- pod/cut/templates/video_cut.html | 1 - pod/cut/tests/test_views.py | 2 +- pod/dressing/context_processors.py | 2 +- pod/dressing/forms.py | 2 +- pod/dressing/models.py | 2 +- pod/dressing/templates/dressing_edit.html | 1 - pod/dressing/templates/video_dressing.html | 1 - pod/dressing/tests/test_views.py | 2 +- pod/enrichment/apps.py | 2 +- pod/enrichment/forms.py | 2 +- pod/enrichment/urls.py | 10 +- pod/enrichment/views.py | 11 ++- pod/import_video/context_processors.py | 2 +- pod/import_video/forms.py | 2 +- pod/import_video/models.py | 2 +- pod/import_video/tests/test_views.py | 2 +- pod/import_video/views.py | 4 +- pod/live/admin.py | 2 +- pod/live/forms.py | 2 +- pod/live/models.py | 2 +- pod/live/pilotingInterface.py | 3 +- pod/live/templates/live/event-all-info.html | 1 - pod/live/templates/live/event-info.html | 1 - pod/live/templates/live/filter_aside.html | 1 - pod/live/templatetags/event_tags.py | 2 +- pod/live/urls.py | 52 +++++----- pod/live/utils.py | 2 +- pod/live/views.py | 2 +- pod/lti/views.py | 2 +- pod/main/admin.py | 2 +- pod/main/configuration.json | 24 ++--- pod/main/context_processors.py | 4 +- pod/main/forms.py | 2 +- pod/main/forms_utils.py | 2 +- pod/main/lang_settings.py | 2 +- pod/main/models.py | 2 +- pod/main/rest_router.py | 28 +++--- pod/main/rest_views.py | 4 + pod/main/templates/aside.html | 11 +-- pod/main/templates/maintenance.html | 1 - .../templatetags/flat_page_edito_filter.py | 2 +- pod/main/tests/test_views.py | 2 +- pod/main/views.py | 5 +- pod/meeting/admin.py | 2 +- pod/meeting/forms.py | 2 +- pod/meeting/models.py | 2 +- pod/meeting/urls.py | 5 +- pod/meeting/utils.py | 2 +- pod/meeting/views.py | 8 +- pod/meeting/webinar.py | 2 +- pod/meeting/webinar_utils.py | 2 +- pod/playlist/context_processors.py | 6 +- pod/playlist/forms.py | 4 +- pod/playlist/signals.py | 2 +- .../templatetags/favorites_playlist.py | 2 +- pod/playlist/views.py | 4 +- pod/podfile/forms.py | 2 +- pod/podfile/urls.py | 34 +++---- pod/podfile/views.py | 2 +- pod/quiz/context_processors.py | 2 +- pod/quiz/tests/test_views.py | 2 +- pod/recorder/admin.py | 2 +- pod/recorder/forms.py | 2 +- pod/recorder/models.py | 4 +- pod/recorder/studio_urls.py | 26 ++--- pod/recorder/studio_urls_digest.py | 32 +++--- pod/recorder/views.py | 5 +- pod/settings.py | 31 +++++- pod/speaker/forms.py | 2 +- pod/urls.py | 99 +++++++++---------- pod/video/admin.py | 2 +- pod/video/feeds.py | 2 +- pod/video/forms.py | 2 +- pod/video/models.py | 10 +- pod/video/templates/videos/add_video.html | 1 - pod/video/templates/videos/filter_aside.html | 23 +---- .../templates/videos/video-all-info.html | 3 +- pod/video/templates/videos/video-iframe.html | 1 - pod/video/templates/videos/video-info.html | 2 - pod/video/templates/videos/video.html | 1 - pod/video/templates/videos/video_edit.html | 1 - .../templates/videos/video_row_select.html | 1 - pod/video/templatetags/video_tags.py | 24 ++--- pod/video/tests/test_models.py | 2 +- pod/video/tests/test_views.py | 2 +- pod/video/translation.py | 2 +- pod/video/urls-rss.py | 14 +-- pod/video/urls.py | 66 ++++++------- pod/video/utils.py | 2 +- pod/video/views.py | 21 ++-- pod/video_encode_transcript/encode.py | 2 +- pod/video_encode_transcript/models.py | 2 +- pod/video_encode_transcript/utils.py | 2 +- pod/video_search/forms.py | 2 +- .../management/commands/create_pod_index.py | 10 +- pod/video_search/urls.py | 4 +- pod/video_search/utils.py | 14 +-- pod/video_search/views.py | 5 +- requirements.txt | 16 +-- 117 files changed, 423 insertions(+), 428 deletions(-) diff --git a/pod/ai_enhancement/forms.py b/pod/ai_enhancement/forms.py index bb18df55f7..774ccd5149 100644 --- a/pod/ai_enhancement/forms.py +++ b/pod/ai_enhancement/forms.py @@ -2,8 +2,8 @@ from django import forms from django.conf import settings -from django.utils.translation import ugettext_lazy as _ -from tagging.fields import TagField +from django.utils.translation import gettext_lazy as _ +from tagulous.models import TagField from pod.main.forms_utils import add_placeholder_and_asterisk from pod.video.models import Video, Discipline diff --git a/pod/ai_enhancement/utils.py b/pod/ai_enhancement/utils.py index ecab02890e..cf4e56847c 100644 --- a/pod/ai_enhancement/utils.py +++ b/pod/ai_enhancement/utils.py @@ -7,7 +7,7 @@ from django.conf import settings from requests import Response from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.ai_enhancement.models import AIEnhancement from pod.main.utils import extract_json_from_str from pod.video.models import Discipline, Video @@ -27,7 +27,7 @@ AI_ENHANCEMENT_API_URL = getattr(settings, "AI_ENHANCEMENT_API_URL", "") AI_ENHANCEMENT_API_VERSION = getattr(settings, "AI_ENHANCEMENT_API_VERSION", "") -USE_NOTIFICATIONS = getattr(settings, "USE_NOTIFICATIONS", True) +USE_NOTIFICATIONS = getattr(settings, "USE_NOTIFICATIONS", False) EMAIL_ON_ENHANCEMENT_COMPLETION = getattr( settings, "EMAIL_ON_ENHANCEMENT_COMPLETION", True ) diff --git a/pod/authentication/admin.py b/pod/authentication/admin.py index 80967ad8c3..aba9678355 100644 --- a/pod/authentication/admin.py +++ b/pod/authentication/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.html import format_html from django.contrib.sites.shortcuts import get_current_site from django.contrib.auth.models import Group diff --git a/pod/authentication/forms.py b/pod/authentication/forms.py index 11159d5a5b..490481bca3 100644 --- a/pod/authentication/forms.py +++ b/pod/authentication/forms.py @@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model from django.contrib.admin.widgets import FilteredSelectMultiple from django.contrib.auth.models import Group -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.sites.models import Site __FILEPICKER__ = False diff --git a/pod/authentication/models.py b/pod/authentication/models.py index a09a6541ef..6474dbb93a 100644 --- a/pod/authentication/models.py +++ b/pod/authentication/models.py @@ -1,7 +1,7 @@ """Esup-Pod authentication models.""" from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth.models import User, Permission, Group from django.conf import settings from django.dispatch import receiver diff --git a/pod/authentication/tests/test_views.py b/pod/authentication/tests/test_views.py index 7ead289664..77fb0baf7d 100644 --- a/pod/authentication/tests/test_views.py +++ b/pod/authentication/tests/test_views.py @@ -7,7 +7,7 @@ from django.test import Client from django.contrib.auth.models import User from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class authenticationViewsTestCase(TestCase): diff --git a/pod/authentication/urls.py b/pod/authentication/urls.py index b0c2206fd0..dffd8e5260 100644 --- a/pod/authentication/urls.py +++ b/pod/authentication/urls.py @@ -2,25 +2,25 @@ from .views import authentication_logout from .views import authentication_login_gateway -from django.conf.urls import url +from django.urls import re_path app_name = "authentication" urlpatterns = [ # auth cas - url( + re_path( r"^login/$", authentication_login, name="authentication_login", ), - url( + re_path( r"^logout/$", authentication_logout, name="authentication_logout", ), - # url(r"^login/$", authentication_login, name="login"), - # url(r"^logout/$", authentication_logout, name="logout"), - url( + # re_path(r"^login/$", authentication_login, name="login"), + # re_path(r"^logout/$", authentication_logout, name="logout"), + re_path( r"^login_gateway/$", authentication_login_gateway, name="authentication_login_gateway", diff --git a/pod/authentication/views.py b/pod/authentication/views.py index 2376b5c751..fefb77f550 100644 --- a/pod/authentication/views.py +++ b/pod/authentication/views.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.conf import settings from django.core.exceptions import SuspiciousOperation -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from cas.decorators import gateway from django.contrib import auth diff --git a/pod/chapter/urls.py b/pod/chapter/urls.py index ab3486d690..cfb60bce40 100644 --- a/pod/chapter/urls.py +++ b/pod/chapter/urls.py @@ -1,10 +1,10 @@ -from django.conf.urls import url +from django.urls import re_path from pod.chapter.views import video_chapter app_name = "chapter" urlpatterns = [ - url( + re_path( r"^(?P[\-\d\w]+)/$", video_chapter, name="video_chapter", diff --git a/pod/completion/admin.py b/pod/completion/admin.py index 12de1b4dbf..8d4f79ea0f 100644 --- a/pod/completion/admin.py +++ b/pod/completion/admin.py @@ -2,7 +2,7 @@ from django.conf import settings from django.contrib import admin -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.completion.models import Contributor from pod.completion.models import Document from pod.completion.models import Overlay diff --git a/pod/completion/forms.py b/pod/completion/forms.py index 69c387e22f..433ec4c5cc 100644 --- a/pod/completion/forms.py +++ b/pod/completion/forms.py @@ -4,8 +4,6 @@ from django.conf import settings from django.forms.widgets import HiddenInput -# from django.utils.translation import ugettext_lazy as _ - from pod.completion.models import Contributor from pod.completion.models import Document from pod.completion.models import Track diff --git a/pod/completion/models.py b/pod/completion/models.py index 0217471364..e4867ad097 100644 --- a/pod/completion/models.py +++ b/pod/completion/models.py @@ -5,7 +5,7 @@ from django.db import models from django.conf import settings from django.core.exceptions import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import slugify from ckeditor.fields import RichTextField from pod.video.models import Video diff --git a/pod/completion/tests/test_models.py b/pod/completion/tests/test_models.py index 245c89792c..7831e1138d 100644 --- a/pod/completion/tests/test_models.py +++ b/pod/completion/tests/test_models.py @@ -12,7 +12,7 @@ from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile from django.core.exceptions import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video from pod.video.models import Type from pod.completion.models import Contributor diff --git a/pod/completion/tests/test_views.py b/pod/completion/tests/test_views.py index 1310eb157f..5d3213b612 100644 --- a/pod/completion/tests/test_views.py +++ b/pod/completion/tests/test_views.py @@ -8,7 +8,7 @@ from django.contrib.auth.models import User from django.core.files.uploadedfile import SimpleUploadedFile from django.contrib.auth import authenticate -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video, Type from ..models import Contributor from ..models import Document diff --git a/pod/completion/urls.py b/pod/completion/urls.py index bd3151e722..87a18cb3e5 100644 --- a/pod/completion/urls.py +++ b/pod/completion/urls.py @@ -1,6 +1,6 @@ """Esup-Pod Video completion urls.""" -from django.conf.urls import url +from django.urls import re_path from .views import video_completion from .views import video_caption_maker from .views import video_completion_contributor @@ -12,37 +12,37 @@ app_name = "completion" urlpatterns = [ - url( + re_path( r"^caption_maker/(?P[\-\d\w]+)/$", video_caption_maker, name="video_caption_maker", ), - url( + re_path( r"^contributor/(?P[\-\d\w]+)/$", video_completion_contributor, name="video_completion_contributor", ), - url( + re_path( r"^speaker/(?P[\-\d\w]+)/$", video_completion_speaker, name="video_completion_speaker", ), - url( + re_path( r"^document/(?P[\-\d\w]+)/$", video_completion_document, name="video_completion_document", ), - url( + re_path( r"^track/(?P[\-\d\w]+)/$", video_completion_track, name="video_completion_track", ), - url( + re_path( r"^overlay/(?P[\-\d\w]+)/$", video_completion_overlay, name="video_completion_overlay", ), - url( + re_path( r"^(?P[\-\d\w]+)/$", video_completion, name="video_completion", diff --git a/pod/completion/views.py b/pod/completion/views.py index 2d2db01bf5..58b60d78d5 100644 --- a/pod/completion/views.py +++ b/pod/completion/views.py @@ -13,6 +13,7 @@ from django.core.exceptions import PermissionDenied from django.core.handlers.wsgi import WSGIRequest from pod.video.models import Video +from pod.main.utils import is_ajax from .models import Contributor from .forms import ContributorForm from .models import Document @@ -293,7 +294,7 @@ def video_completion_contributor_new(request: WSGIRequest, video: Video): form_contributor = ContributorForm(initial={"video": video}) context = get_video_completion_context(video, form_contributor=form_contributor) context["page_title"] = _("Add a new contributor to the video “%s”") % video.title - if request.is_ajax(): + if is_ajax(request): return render( request, "contributor/form_contributor.html", @@ -322,7 +323,7 @@ def video_completion_contributor_save(request: WSGIRequest, video: Video): if form_contributor.is_valid(): form_contributor.save() list_contributor = video.contributor_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "contributor/list_contributor.html", @@ -351,7 +352,7 @@ def video_completion_contributor_save(request: WSGIRequest, video: Video): context, ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format(_("Please correct errors")), "form": render_to_string( @@ -381,7 +382,7 @@ def video_completion_contributor_modify(request: WSGIRequest, video: Video): contributor = get_object_or_404(Contributor, id=request.POST["id"]) form_contributor = ContributorForm(instance=contributor) page_title = _("Edit the contributor “%s”") % contributor.name - if request.is_ajax(): + if is_ajax(request): return render( request, "contributor/form_contributor.html", @@ -406,7 +407,7 @@ def video_completion_contributor_delete(request: WSGIRequest, video: Video): contributor.delete() page_title = get_completion_home_page_title(video) list_contributor = video.contributor_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "contributor/list_contributor.html", @@ -491,7 +492,7 @@ def video_completion_speaker_new(request: WSGIRequest, video: Video): form_speaker = JobVideoForm(initial={"video": video}) context = get_video_completion_context(video, form_speaker=form_speaker) context["page_title"] = _("Add a new contributor to the video “%s”") % video.title - if request.is_ajax(): + if is_ajax(request): return render( request, "speaker/form_speaker.html", @@ -516,7 +517,7 @@ def video_completion_speaker_save(request: WSGIRequest, video: Video): if form_speaker.is_valid(): form_speaker.save() list_speaker = get_video_speakers(video) - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "speaker/list_speaker.html", @@ -543,7 +544,7 @@ def video_completion_speaker_save(request: WSGIRequest, video: Video): context, ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format(_("Please correct errors")), "form": render_to_string( @@ -574,7 +575,7 @@ def video_completion_speaker_delete(request: WSGIRequest, video: Video): speaker.delete() page_title = get_completion_home_page_title(video) list_speaker = get_video_speakers(video) - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "speaker/list_speaker.html", @@ -632,7 +633,7 @@ def video_completion_document_new(request, video): """View to add new document to a video.""" form_document = DocumentForm(initial={"video": video}) context = get_video_completion_context(video, form_document=form_document) - if request.is_ajax(): + if is_ajax(request): return render( request, "document/form_document.html", @@ -658,7 +659,7 @@ def video_completion_document_save(request, video): if form_document.is_valid(): form_document.save() list_document = video.document_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "document/list_document.html", @@ -675,7 +676,7 @@ def video_completion_document_save(request, video): context, ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format(_("Please correct errors")), "form": render_to_string( @@ -698,7 +699,7 @@ def video_completion_document_modify(request, video): """View to modify a document associated to a video.""" document = get_object_or_404(Document, id=request.POST["id"]) form_document = DocumentForm(instance=document) - if request.is_ajax(): + if is_ajax(request): return render( request, "document/form_document.html", @@ -718,7 +719,7 @@ def video_completion_document_delete(request, video): document = get_object_or_404(Document, id=request.POST["id"]) document.delete() list_document = video.document_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "document/list_document.html", @@ -772,7 +773,7 @@ def video_completion_track_new(request, video): """View to add new track to a video.""" form_track = TrackForm(initial={"video": video}) context = get_video_completion_context(video, form_track=form_track) - if request.is_ajax(): + if is_ajax(request): return render( request, "track/form_track.html", @@ -799,7 +800,7 @@ def video_completion_get_form_track(request): def toggle_form_track_is_valid__video_completion_track(request, video, list_track): """Toggle form_track is valid.""" - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "track/list_track.html", @@ -829,7 +830,7 @@ def video_completion_track_save(request, video): request, video, list_track ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format("Please correct errors"), "form": render_to_string( @@ -855,7 +856,7 @@ def video_completion_track_modify(request, video): """View to modify a track associated to a video.""" track = get_object_or_404(Track, id=request.POST["id"]) form_track = TrackForm(instance=track) - if request.is_ajax(): + if is_ajax(request): return render( request, "track/form_track.html", @@ -956,7 +957,7 @@ def video_completion_overlay_new(request, video): """Form to create a new completion overlay.""" form_overlay = OverlayForm(initial={"video": video}) context = get_video_completion_context(video, form_overlay=form_overlay) - if request.is_ajax(): + if is_ajax(request): return render( request, "overlay/form_overlay.html", @@ -985,7 +986,7 @@ def video_completion_overlay_save(request, video): if form_overlay.is_valid(): form_overlay.save() list_overlay = video.overlay_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "overlay/list_overlay.html", @@ -1003,7 +1004,7 @@ def video_completion_overlay_save(request, video): context, ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format(_("Please correct errors")), "form": render_to_string( @@ -1032,7 +1033,7 @@ def video_completion_overlay_modify(request, video): overlay = get_simple_url(overlay) form_overlay = OverlayForm(instance=overlay) - if request.is_ajax(): + if is_ajax(request): return render( request, "overlay/form_overlay.html", @@ -1051,7 +1052,7 @@ def video_completion_overlay_delete(request, video): overlay = get_object_or_404(Overlay, id=request.POST["id"]) overlay.delete() list_overlay = video.overlay_set.all() - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_data": render_to_string( "overlay/list_overlay.html", diff --git a/pod/cut/context_processors.py b/pod/cut/context_processors.py index 2fe8f4bde6..8e82955f69 100644 --- a/pod/cut/context_processors.py +++ b/pod/cut/context_processors.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings -USE_CUT = getattr(django_settings, "USE_CUT", True) +USE_CUT = getattr(django_settings, "USE_CUT", False) def context_settings(request): diff --git a/pod/cut/models.py b/pod/cut/models.py index 074dd64c56..ab829c6728 100644 --- a/pod/cut/models.py +++ b/pod/cut/models.py @@ -1,7 +1,7 @@ from django.db import models from django.forms import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video from pod.video_encode_transcript.utils import time_to_seconds diff --git a/pod/cut/templates/video_cut.html b/pod/cut/templates/video_cut.html index 6dbb8ceb64..71c8998247 100644 --- a/pod/cut/templates/video_cut.html +++ b/pod/cut/templates/video_cut.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% load video_filters %} {% load video_tags %} diff --git a/pod/cut/tests/test_views.py b/pod/cut/tests/test_views.py index 189d68a389..de28435fa8 100644 --- a/pod/cut/tests/test_views.py +++ b/pod/cut/tests/test_views.py @@ -8,7 +8,7 @@ from pod.main.models import Configuration from datetime import time from django.contrib.messages import get_messages -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .. import views from importlib import reload diff --git a/pod/dressing/context_processors.py b/pod/dressing/context_processors.py index fa36733113..d5a2f1cd1d 100644 --- a/pod/dressing/context_processors.py +++ b/pod/dressing/context_processors.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings -USE_DRESSING = getattr(django_settings, "USE_DRESSING", True) +USE_DRESSING = getattr(django_settings, "USE_DRESSING", False) def context_settings(request): diff --git a/pod/dressing/forms.py b/pod/dressing/forms.py index 8d620e9d6d..79974b1bb9 100644 --- a/pod/dressing/forms.py +++ b/pod/dressing/forms.py @@ -6,7 +6,7 @@ from django.contrib.sites.models import Site from django_select2 import forms as s2forms from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib import admin from django.contrib.admin import widgets diff --git a/pod/dressing/models.py b/pod/dressing/models.py index 140cfa9647..c69a0418ee 100644 --- a/pod/dressing/models.py +++ b/pod/dressing/models.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import User from pod.authentication.models import AccessGroup from pod.podfile.models import CustomImageModel -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video diff --git a/pod/dressing/templates/dressing_edit.html b/pod/dressing/templates/dressing_edit.html index 0c38c1cccd..72719d6021 100644 --- a/pod/dressing/templates/dressing_edit.html +++ b/pod/dressing/templates/dressing_edit.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% block page_extra_head %} diff --git a/pod/dressing/templates/video_dressing.html b/pod/dressing/templates/video_dressing.html index 5cf342b5bf..f8bb83d91d 100644 --- a/pod/dressing/templates/video_dressing.html +++ b/pod/dressing/templates/video_dressing.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% load video_filters %} {% load video_tags %} diff --git a/pod/dressing/tests/test_views.py b/pod/dressing/tests/test_views.py index 18f7cf65e1..1a7ebde117 100644 --- a/pod/dressing/tests/test_views.py +++ b/pod/dressing/tests/test_views.py @@ -1,7 +1,7 @@ """Unit tests for Esup-Pod dressing views.""" from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.messages import get_messages from django.test import TestCase from django.urls import reverse diff --git a/pod/enrichment/apps.py b/pod/enrichment/apps.py index 7739973b68..9b58c08bf6 100644 --- a/pod/enrichment/apps.py +++ b/pod/enrichment/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class EnrichmentConfig(AppConfig): diff --git a/pod/enrichment/forms.py b/pod/enrichment/forms.py index fc79c3905c..f650c23d10 100644 --- a/pod/enrichment/forms.py +++ b/pod/enrichment/forms.py @@ -2,7 +2,7 @@ from django.conf import settings from django.forms.widgets import HiddenInput from django.contrib.admin import widgets -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.safestring import mark_safe from .models import Enrichment, EnrichmentGroup, EnrichmentVtt from django.contrib.auth.models import Group diff --git a/pod/enrichment/urls.py b/pod/enrichment/urls.py index d4864b9290..0a9a317010 100644 --- a/pod/enrichment/urls.py +++ b/pod/enrichment/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path from .views import edit_enrichment from .views import video_enrichment from .views import group_enrichment @@ -6,18 +6,18 @@ app_name = "enrichment" urlpatterns = [ - url(r"^edit/(?P[\-\d\w]+)/$", edit_enrichment, name="edit_enrichment"), - url( + re_path(r"^edit/(?P[\-\d\w]+)/$", edit_enrichment, name="edit_enrichment"), + re_path( r"^group/(?P[\-\d\w]+)/$", group_enrichment, name="group_enrichment", ), - url( + re_path( r"^video/(?P[\-\d\w]+)/$", video_enrichment, name="video_enrichment", ), - url( + re_path( r"^video/(?P[\-\d\w]+)/(?P[\-\d\w]+)/$", video_enrichment, name="video_enrichment_private", diff --git a/pod/enrichment/views.py b/pod/enrichment/views.py index 0c91e45a96..75fe8be348 100644 --- a/pod/enrichment/views.py +++ b/pod/enrichment/views.py @@ -16,6 +16,7 @@ from pod.video.models import Video from pod.video.utils import sort_videos_list from pod.video.views import render_video +from pod.main.utils import is_ajax from .models import Enrichment, EnrichmentGroup from .forms import EnrichmentForm, EnrichmentGroupForm @@ -108,7 +109,7 @@ def edit_enrichment_new(request, video): list_enrichment = video.enrichment_set.all() form_enrichment = EnrichmentForm(initial={"video": video, "start": 0, "end": 1}) - if request.is_ajax(): + if is_ajax(request): return render( request, "enrichment/form_enrichment.html", @@ -143,7 +144,7 @@ def edit_enrichment_save(request, video): form_enrichment.save() # list_enrichment = video.enrichment_set.all() # enrichment_to_vtt(list_enrichment, video) - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_enrichment": render_to_string( "enrichment/list_enrichment.html", @@ -160,7 +161,7 @@ def edit_enrichment_save(request, video): {"video": video, "list_enrichment": list_enrichment}, ) else: - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "errors": "{0}".format(_("Please correct errors.")), "form": render_to_string( @@ -188,7 +189,7 @@ def edit_enrichment_modify(request, video): enrich = get_object_or_404(Enrichment, id=request.POST["id"]) form_enrichment = EnrichmentForm(instance=enrich) - if request.is_ajax(): + if is_ajax(request): return render( request, "enrichment/form_enrichment.html", @@ -212,7 +213,7 @@ def edit_enrichment_delete(request, video): list_enrichment = video.enrichment_set.all() # if list_enrichment: # enrichment_to_vtt(list_enrichment, video) - if request.is_ajax(): + if is_ajax(request): some_data_to_dump = { "list_enrichment": render_to_string( "enrichment/list_enrichment.html", diff --git a/pod/import_video/context_processors.py b/pod/import_video/context_processors.py index d72e775b31..9e2dbc4b25 100644 --- a/pod/import_video/context_processors.py +++ b/pod/import_video/context_processors.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings -USE_IMPORT_VIDEO = getattr(django_settings, "USE_IMPORT_VIDEO", True) +USE_IMPORT_VIDEO = getattr(django_settings, "USE_IMPORT_VIDEO", False) RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY = getattr( django_settings, "RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY", True diff --git a/pod/import_video/forms.py b/pod/import_video/forms.py index 1a858eb0d9..0b8ad7d422 100644 --- a/pod/import_video/forms.py +++ b/pod/import_video/forms.py @@ -5,7 +5,7 @@ from django.contrib.sites.models import Site from django.core.validators import URLValidator from django.core.exceptions import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.import_video.models import ExternalRecording from pod.main.forms_utils import add_placeholder_and_asterisk from pod.main.forms_utils import OwnerWidget, AddOwnerWidget diff --git a/pod/import_video/models.py b/pod/import_video/models.py index b28a3615f7..68e6b77334 100644 --- a/pod/import_video/models.py +++ b/pod/import_video/models.py @@ -12,7 +12,7 @@ from django.db.models.signals import pre_save from django.dispatch import receiver from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.meeting.utils import ( api_call, diff --git a/pod/import_video/tests/test_views.py b/pod/import_video/tests/test_views.py index 28baa1cc14..e70858a13e 100644 --- a/pod/import_video/tests/test_views.py +++ b/pod/import_video/tests/test_views.py @@ -14,7 +14,7 @@ from django.test import TestCase from django.test import Client from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from http import HTTPStatus # Directory that will contain the video files generated by bbb-recorder diff --git a/pod/import_video/views.py b/pod/import_video/views.py index 77b711ee45..8c82936a00 100644 --- a/pod/import_video/views.py +++ b/pod/import_video/views.py @@ -40,7 +40,7 @@ from django.views.decorators.csrf import ensure_csrf_cookie from pod.import_video.utils import manage_download from pod.main.views import in_maintenance -from pod.main.utils import secure_post_request, display_message_with_icon +from pod.main.utils import secure_post_request, display_message_with_icon, is_ajax # For Youtube download from pytube import YouTube @@ -1213,7 +1213,7 @@ def recording_with_token(request, id): # JSON format data = '{"presentationUrl": "%s", "videoUrl": "%s"}' % (presentation_url, video_url) - if request.is_ajax(): + if is_ajax(request): return HttpResponse(data, content_type="application/json") else: return HttpResponseBadRequest() diff --git a/pod/live/admin.py b/pod/live/admin.py index 6f6898bb1e..bfe2aef599 100644 --- a/pod/live/admin.py +++ b/pod/live/admin.py @@ -4,7 +4,7 @@ from django.contrib.sites.shortcuts import get_current_site from django.urls import reverse from django.utils.html import format_html -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from js_asset import static from sorl.thumbnail import get_thumbnail diff --git a/pod/live/forms.py b/pod/live/forms.py index b580737a51..eba64d14cc 100644 --- a/pod/live/forms.py +++ b/pod/live/forms.py @@ -1,7 +1,7 @@ from django import forms from django.conf import settings from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.admin import widgets from pod.live.models import ( Broadcaster, diff --git a/pod/live/models.py b/pod/live/models.py index 9af42db514..dd58d22339 100644 --- a/pod/live/models.py +++ b/pod/live/models.py @@ -19,7 +19,7 @@ from django.urls import reverse from django.utils import timezone from django.utils.html import format_html -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.lang_settings import ALL_LANG_CHOICES as __ALL_LANG_CHOICES__ from pod.main.lang_settings import PREF_LANG_CHOICES as __PREF_LANG_CHOICES__ diff --git a/pod/live/pilotingInterface.py b/pod/live/pilotingInterface.py index a37676402d..bc87ed1294 100644 --- a/pod/live/pilotingInterface.py +++ b/pod/live/pilotingInterface.py @@ -16,6 +16,7 @@ from .models import Broadcaster, Event from .utils import date_string_to_second +from pod.main.utils import is_ajax DEFAULT_EVENT_PATH = getattr(settings, "DEFAULT_EVENT_PATH", "") @@ -140,7 +141,7 @@ def get_stream_rtmp_infos(self) -> dict: def ajax_get_mandatory_parameters(request): """Return the mandatory parameters as a json response.""" - if request.method == "GET" and request.is_ajax(): + if request.method == "GET" and is_ajax(request): impl_name = request.GET.get("impl_name", None) params = get_mandatory_parameters(impl_name) params_json = {} diff --git a/pod/live/templates/live/event-all-info.html b/pod/live/templates/live/event-all-info.html index 004246ff38..3332e34116 100644 --- a/pod/live/templates/live/event-all-info.html +++ b/pod/live/templates/live/event-all-info.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load tagging_tags %}
diff --git a/pod/live/templates/live/event-info.html b/pod/live/templates/live/event-info.html index 9d4f44fdbb..0abae160bd 100644 --- a/pod/live/templates/live/event-info.html +++ b/pod/live/templates/live/event-info.html @@ -1,6 +1,5 @@ {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% load event_tags %} diff --git a/pod/live/templates/live/filter_aside.html b/pod/live/templates/live/filter_aside.html index 9986f68f14..520e21d3bd 100644 --- a/pod/live/templates/live/filter_aside.html +++ b/pod/live/templates/live/filter_aside.html @@ -1,6 +1,5 @@ {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% spaceless %} diff --git a/pod/live/templatetags/event_tags.py b/pod/live/templatetags/event_tags.py index d817052102..0885d8e56a 100644 --- a/pod/live/templatetags/event_tags.py +++ b/pod/live/templatetags/event_tags.py @@ -1,7 +1,7 @@ from django.template.defaultfilters import register from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.live.models import Event from pod.live.views import can_manage_event from pod.main.utils import generate_qrcode diff --git a/pod/live/urls.py b/pod/live/urls.py index c1f8377c2b..0f813cce91 100644 --- a/pod/live/urls.py +++ b/pod/live/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path from .pilotingInterface import ajax_get_mandatory_parameters from .views import ( @@ -30,83 +30,83 @@ urlpatterns = [] urlpatterns += [ - # url(r"^$", lives, name="lives"), - url( + # re_path(r"^$", lives, name="lives"), + re_path( r"^ajax_calls/event_startrecord/$", ajax_event_startrecord, name="ajax_event_startrecord", ), - url( + re_path( r"^ajax_calls/event_stoprecord/$", ajax_event_stoprecord, name="ajax_event_stoprecord", ), - url( + re_path( r"^ajax_calls/event_splitrecord/$", ajax_event_splitrecord, name="ajax_event_splitrecord", ), - url( + re_path( r"^ajax_calls/event_start_streaming/$", ajax_event_start_streaming, name="ajax_event_start_streaming", ), - url( + re_path( r"^ajax_calls/event_stop_streaming/$", ajax_event_stop_streaming, name="ajax_event_stop_streaming", ), - url( + re_path( r"^ajax_calls/event_get_rtmp_config/$", ajax_event_get_rtmp_config, name="ajax_event_get_rtmp_config", ), - url( + re_path( r"^ajax_calls/getbroadcastersfrombuiding/$", broadcasters_from_building, name="broadcasters_from_building", ), - url( + re_path( r"^ajax_calls/getbroadcasterrestriction/$", broadcaster_restriction, name="ajax_broadcaster_restriction", ), - url( + re_path( r"^ajax_calls/geteventinforcurrentecord/$", ajax_event_info_record, name="ajax_event_info_record", ), - url( + re_path( r"^ajax_calls/geteventvideocards/$", event_get_video_cards, name="event_get_video_cards", ), - url( + re_path( r"^ajax_calls/isstreamavailabletorecord/$", ajax_is_stream_available_to_record, name="ajax_is_stream_available_to_record", ), - url( + re_path( r"^ajax_calls/getmandatoryparameters/$", ajax_get_mandatory_parameters, name="ajax_get_mandatory_parameters", ), - url(r"^ajax_calls/heartbeat/", heartbeat, name="heartbeat"), - url(r"^direct/(?P[\-\w]+)/$", direct, name="direct"), - url(r"^directs/$", directs_all, name="directs_all"), - url(r"^directs/(?P\d+)/$", directs, name="directs"), - url(r"^event/(?P[\-\w]+)/$", event, name="event"), - url( + re_path(r"^ajax_calls/heartbeat/", heartbeat, name="heartbeat"), + re_path(r"^direct/(?P[\-\w]+)/$", direct, name="direct"), + re_path(r"^directs/$", directs_all, name="directs_all"), + re_path(r"^directs/(?P\d+)/$", directs, name="directs"), + re_path(r"^event/(?P[\-\w]+)/$", event, name="event"), + re_path( r"^event/(?P[\-\w]+)/(?P[\-\w]+)/$", event, name="event_private", ), - url(r"^event_edit/$", event_edit, name="event_edit"), - url(r"^event_edit/(?P[\-\w]+)/$", event_edit, name="event_edit"), - url(r"^event_delete/(?P[\-\w]+)/$", event_delete, name="event_delete"), - url(r"^events/$", events, name="events"), - url(r"^my_events/$", my_events, name="my_events"), - url( + re_path(r"^event_edit/$", event_edit, name="event_edit"), + re_path(r"^event_edit/(?P[\-\w]+)/$", event_edit, name="event_edit"), + re_path(r"^event_delete/(?P[\-\w]+)/$", event_delete, name="event_delete"), + re_path(r"^events/$", events, name="events"), + re_path(r"^my_events/$", my_events, name="my_events"), + re_path( r"^event_immediate_edit/(?P\d+)/$", event_immediate_edit, name="event_immediate_edit", diff --git a/pod/live/utils.py b/pod/live/utils.py index c9c39094b1..1cb5bb1579 100644 --- a/pod/live/utils.py +++ b/pod/live/utils.py @@ -13,7 +13,7 @@ from django.contrib import messages from django.core.exceptions import PermissionDenied from django.core.mail import EmailMultiAlternatives, mail_managers -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.views import TEMPLATE_VISIBLE_SETTINGS diff --git a/pod/live/views.py b/pod/live/views.py index 862ab0cffd..4608b34092 100644 --- a/pod/live/views.py +++ b/pod/live/views.py @@ -28,7 +28,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect from pod.meeting.models import Livestream from rest_framework import status diff --git a/pod/lti/views.py b/pod/lti/views.py index 49454038cb..1be0d294b1 100644 --- a/pod/lti/views.py +++ b/pod/lti/views.py @@ -8,7 +8,7 @@ from django.urls import reverse from django.contrib import messages -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video diff --git a/pod/main/admin.py b/pod/main/admin.py index c23483d38f..a5e12d83e5 100644 --- a/pod/main/admin.py +++ b/pod/main/admin.py @@ -6,7 +6,7 @@ from django.contrib.flatpages.admin import FlatpageForm from django.contrib.flatpages.models import FlatPage from django.contrib.sites.models import Site -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from django.contrib.sites.shortcuts import get_current_site from modeltranslation.admin import TranslationAdmin diff --git a/pod/main/configuration.json b/pod/main/configuration.json index ae5cf1d903..642c2008fa 100644 --- a/pod/main/configuration.json +++ b/pod/main/configuration.json @@ -1003,7 +1003,7 @@ }, "settings": { "USE_CUT": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of the Cut application" @@ -1034,7 +1034,7 @@ }, "settings": { "USE_DRESSING": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of dressings. Allows users to customize a video with watermark & credits." @@ -1133,7 +1133,7 @@ "pod_version_init": "3.3.0" }, "USE_IMPORT_VIDEO": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of the video import application" @@ -1178,7 +1178,7 @@ "pod_version_init": "3.5.1" }, "IMPORT_VIDEO_BBB_RECORDER_PATH": { - "default_value": true, + "default_value": "/data/bbb-recorder/media/", "description": { "en": [ "Directory that will contain the video files generated by bbb-recorder." @@ -1550,10 +1550,10 @@ ], "fr": [ "Utilisation de BigBlueButton", - "[TODO] À retirer dans les futures versions de Pod" + "Module obsolète." ] }, - "pod_version_end": "", + "pod_version_end": "3.8.2", "pod_version_init": "3.1" }, "USE_BBB_LIVE": { @@ -1571,7 +1571,7 @@ "pod_version_init": "3.1" }, "USE_IMPORT_VIDEO": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of the video import application" @@ -2060,7 +2060,7 @@ "pod_version_init": "3.6" }, "USE_FAVORITES": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of favorite videos.", @@ -2075,7 +2075,7 @@ "pod_version_init": "3.4" }, "USE_PLAYLIST": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of playlist. Allows users to add videos in a playlist." @@ -2088,7 +2088,7 @@ "pod_version_init": "3.4" }, "USE_PROMOTED_PLAYLIST": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of promoted playlists. Allows users to use the promoted playlists." @@ -2177,7 +2177,7 @@ "description": {}, "settings": { "USE_NOTIFICATIONS": { - "default_value": true, + "default_value": false, "description": { "en": [ "" @@ -2222,7 +2222,7 @@ }, "settings": { "USE_QUIZ": { - "default_value": true, + "default_value": false, "description": { "en": [ "Activation of quizzes. Allows users to create, respond and use quizzes in videos." diff --git a/pod/main/context_processors.py b/pod/main/context_processors.py index eea1502933..21346601d9 100644 --- a/pod/main/context_processors.py +++ b/pod/main/context_processors.py @@ -6,7 +6,7 @@ from pod.main.models import Configuration from django.contrib.sites.shortcuts import get_current_site -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ MENUBAR_HIDE_INACTIVE_OWNERS = getattr( django_settings, "MENUBAR_HIDE_INACTIVE_OWNERS", False @@ -79,7 +79,7 @@ RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY = getattr( django_settings, "RESTRICT_EDIT_MEETING_ACCESS_TO_STAFF_ONLY", False ) -USE_NOTIFICATIONS = getattr(django_settings, "USE_NOTIFICATIONS", True) +USE_NOTIFICATIONS = getattr(django_settings, "USE_NOTIFICATIONS", False) WEBTV_MODE = getattr(django_settings, "WEBTV_MODE", False) diff --git a/pod/main/forms.py b/pod/main/forms.py index 721dd949a0..dddd91e4e7 100644 --- a/pod/main/forms.py +++ b/pod/main/forms.py @@ -1,7 +1,7 @@ """Esup-Pod forms handling.""" from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from captcha.fields import CaptchaField from .forms_utils import add_placeholder_and_asterisk diff --git a/pod/main/forms_utils.py b/pod/main/forms_utils.py index 7528135408..622c8e7817 100644 --- a/pod/main/forms_utils.py +++ b/pod/main/forms_utils.py @@ -5,7 +5,7 @@ from django.contrib.admin import widgets from django.forms.utils import to_current_timezone from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class MyAdminSplitDateTime(forms.MultiWidget): diff --git a/pod/main/lang_settings.py b/pod/main/lang_settings.py index 5adf466588..71f941a87b 100644 --- a/pod/main/lang_settings.py +++ b/pod/main/lang_settings.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # http://www.w3schools.com/tags/ref_language_codes.asp # http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes diff --git a/pod/main/models.py b/pod/main/models.py index 8b89b88501..2e4cf4bc6a 100644 --- a/pod/main/models.py +++ b/pod/main/models.py @@ -2,7 +2,7 @@ from django.db import models from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.flatpages.models import FlatPage from django.contrib.sites.models import Site from django.core.exceptions import ValidationError diff --git a/pod/main/rest_router.py b/pod/main/rest_router.py index 5b99fa0864..b55653828c 100644 --- a/pod/main/rest_router.py +++ b/pod/main/rest_router.py @@ -1,7 +1,7 @@ """Esup-Pod Main REST api url router.""" from rest_framework import routers -from django.conf.urls import url +from django.urls import re_path from django.conf.urls import include from pod.authentication import rest_views as authentication_views from pod.video import rest_views as video_views @@ -26,8 +26,8 @@ router = routers.DefaultRouter() -router.register(r"mainfiles", main_views.CustomFileModelViewSet) -router.register(r"mainimages", main_views.CustomImageModelViewSet) +# router.register(r"mainfiles", main_views.CustomFileModelViewSet) +# router.register(r"mainimages", main_views.CustomImageModelViewSet) router.register(r"users", authentication_views.UserViewSet) router.register(r"groups", authentication_views.GroupViewSet) @@ -76,43 +76,43 @@ router.register(r"meeting_live_gateway", meeting_views.LiveGatewayModelViewSet) urlpatterns = [ - url(r"dublincore/$", video_views.DublinCoreView.as_view(), name="dublincore"), - url( + re_path(r"dublincore/$", video_views.DublinCoreView.as_view(), name="dublincore"), + re_path( r"^launch_encode_view/$", encode_views.launch_encode_view, name="launch_encode_view", ), - url( + re_path( r"store_remote_encoded_video/$", encode_views.store_remote_encoded_video, name="store_remote_encoded_video", ), - url( + re_path( r"store_remote_encoded_video_studio/$", encode_views.store_remote_encoded_video_studio, name="store_remote_encoded_video_studio", ), - url( + re_path( r"store_remote_transcripted_video/$", encode_views.store_remote_transcripted_video, name="store_remote_transcripted_video", ), - url( + re_path( r"accessgroups_set_users_by_name/$", auth_views.accessgroups_set_users_by_name, name="accessgroups_set_users_by_name", ), - url( + re_path( r"accessgroups_remove_users_by_name/$", auth_views.accessgroups_remove_users_by_name, name="accessgroups_set_users_by_name", ), - url( + re_path( r"accessgroups_set_user_accessgroup /$", auth_views.accessgroups_set_user_accessgroup, name="accessgroups_set_user_accessgroup ", ), - url( + re_path( r"accessgroups_remove_user_accessgroup /$", auth_views.accessgroups_remove_user_accessgroup, name="accessgroups_remove_user_accessgroup ", @@ -121,7 +121,7 @@ USE_TRANSCRIPTION = getattr(settings, "USE_TRANSCRIPTION", False) if USE_TRANSCRIPTION: urlpatterns += [ - url( + re_path( r"launch_transcript_view/$", encode_views.launch_transcript_view, name="launch_transcript_view", @@ -133,5 +133,5 @@ mod.add_register(router) urlpatterns += [ - url(r"^", include(router.urls)), + re_path(r"^", include(router.urls)), ] diff --git a/pod/main/rest_views.py b/pod/main/rest_views.py index 3e232219ec..3424616163 100644 --- a/pod/main/rest_views.py +++ b/pod/main/rest_views.py @@ -8,10 +8,12 @@ class Meta: fields = ("id", "url", "file") +""" class CustomFileModelSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = CustomFileModel fields = ("id", "url", "file") +""" class CustomImageModelViewSet(viewsets.ModelViewSet): @@ -19,6 +21,8 @@ class CustomImageModelViewSet(viewsets.ModelViewSet): serializer_class = CustomImageModelSerializer +""" class CustomFileModelViewSet(viewsets.ModelViewSet): queryset = CustomFileModel.objects.all() serializer_class = CustomFileModelSerializer +""" diff --git a/pod/main/templates/aside.html b/pod/main/templates/aside.html index 59b8ed96f1..b455ec2364 100644 --- a/pod/main/templates/aside.html +++ b/pod/main/templates/aside.html @@ -63,20 +63,17 @@

{% endif %} {% if HIDE_TAGS == False %} - {% tag_cloud_for_model video.Video as tagscloud with distribution=log steps=16 min_count=4 %} - {% if tagscloud|length > 0 %} + {% if tag_cloud|length > 0 %}

 {% trans 'Tags' %}

- {% with tagslist=tagscloud|dictsortreversed:"count"|slice:":20" %} - {% for tag in tagslist %} - - {{tag.name}} {{tag.count}} + {% for tag in tag_cloud %} + + {{ tag.name }} {% endfor %} - {% endwith %}

{% endif %} diff --git a/pod/main/templates/maintenance.html b/pod/main/templates/maintenance.html index 494de8917e..3885c99b00 100644 --- a/pod/main/templates/maintenance.html +++ b/pod/main/templates/maintenance.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load tagging_tags %} {% load thumbnail %} {% load video_filters %} {% load video_tags %} diff --git a/pod/main/templatetags/flat_page_edito_filter.py b/pod/main/templatetags/flat_page_edito_filter.py index 536bd399f8..1c23633522 100644 --- a/pod/main/templatetags/flat_page_edito_filter.py +++ b/pod/main/templatetags/flat_page_edito_filter.py @@ -14,7 +14,7 @@ from django.db.models import Q, Sum from django.template import loader from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.live.models import Event from pod.video.models import Video diff --git a/pod/main/tests/test_views.py b/pod/main/tests/test_views.py index af408b92ca..2d5cb02055 100644 --- a/pod/main/tests/test_views.py +++ b/pod/main/tests/test_views.py @@ -7,7 +7,7 @@ from django.test import TestCase from django.test import Client from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.flatpages.models import FlatPage from django.contrib.auth.models import User from django.core.exceptions import PermissionDenied diff --git a/pod/main/views.py b/pod/main/views.py index 2d20faa11f..b60d7c3114 100644 --- a/pod/main/views.py +++ b/pod/main/views.py @@ -26,7 +26,7 @@ from django.views.decorators.http import require_GET from django.template import loader from django.core.mail import EmailMultiAlternatives -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.shortcuts import redirect from django.contrib.auth.models import User from django.core.exceptions import PermissionDenied, SuspiciousOperation @@ -42,6 +42,7 @@ import json from django.contrib.auth.decorators import login_required from .models import Configuration +from .utils import is_ajax from honeypot.decorators import check_honeypot @@ -324,7 +325,7 @@ def contact_us(request): @login_required(redirect_field_name="referrer") def user_autocomplete(request): """Search for users with partial names, for autocompletion.""" - if request.is_ajax(): + if is_ajax(request): additional_filters = { "video__is_draft": False, "owner__sites": get_current_site(request), diff --git a/pod/meeting/admin.py b/pod/meeting/admin.py index 9462b55f69..01aa76bbee 100644 --- a/pod/meeting/admin.py +++ b/pod/meeting/admin.py @@ -3,7 +3,7 @@ from django.contrib import admin from django.contrib.sites.shortcuts import get_current_site from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.html import mark_safe from django.contrib.admin import widgets from django.utils.safestring import SafeText diff --git a/pod/meeting/forms.py b/pod/meeting/forms.py index 360c6e87d3..4974cc5c20 100644 --- a/pod/meeting/forms.py +++ b/pod/meeting/forms.py @@ -15,7 +15,7 @@ from django.db.models.query import QuerySet from django.forms import CharField, Textarea from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.forms_utils import add_placeholder_and_asterisk from pod.main.forms_utils import OwnerWidget, AddOwnerWidget from pod.meeting.webinar import start_webinar, stop_webinar, toggle_rtmp_gateway diff --git a/pod/meeting/models.py b/pod/meeting/models.py index 4fd683916c..6470911aea 100644 --- a/pod/meeting/models.py +++ b/pod/meeting/models.py @@ -15,7 +15,7 @@ from django.db import models from django.conf import settings from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.sites.models import Site from django.contrib.auth.models import User from django.db.models.signals import pre_save diff --git a/pod/meeting/urls.py b/pod/meeting/urls.py index 10d588f687..0a275e1d1c 100644 --- a/pod/meeting/urls.py +++ b/pod/meeting/urls.py @@ -1,7 +1,6 @@ """URLs for Meeting module.""" -from django.conf.urls import url -from django.urls import path +from django.urls import path, re_path from . import views @@ -55,7 +54,7 @@ path( "//", views.join, name="join" ), - url( + re_path( r"^live_publish_chat/(?P[\d]+)/$", views.live_publish_chat, name="live_publish_chat", diff --git a/pod/meeting/utils.py b/pod/meeting/utils.py index 066ed6d027..81eff2f0b1 100644 --- a/pod/meeting/utils.py +++ b/pod/meeting/utils.py @@ -4,7 +4,7 @@ from datetime import date, timedelta from django.conf import settings from django.core.mail import EmailMultiAlternatives -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from hashlib import sha1 from pod.main.views import TEMPLATE_VISIBLE_SETTINGS diff --git a/pod/meeting/views.py b/pod/meeting/views.py index ba4523ec24..5f6c0c5780 100644 --- a/pod/meeting/views.py +++ b/pod/meeting/views.py @@ -42,7 +42,7 @@ from pod.import_video.utils import manage_download, parse_remote_file from pod.import_video.utils import save_video, secure_request_for_upload from pod.main.views import in_maintenance, TEMPLATE_VISIBLE_SETTINGS -from pod.main.utils import secure_post_request, display_message_with_icon +from pod.main.utils import secure_post_request, display_message_with_icon, is_ajax from pod.meeting.webinar import chat_rtmp_gateway, start_webinar, stop_webinar from pod.meeting.webinar_utils import search_for_available_livegateway, manage_webinar from pod.live.models import Event @@ -648,7 +648,7 @@ def end(request: WSGIRequest, meeting_id: str) -> HttpResponse: for key in args: msg += "%s: %s
" % (key, args[key]) msg = mark_safe(msg) - if request.is_ajax(): + if is_ajax(request): return JsonResponse({"end": meeting.end(), "msg": msg}, safe=False) else: if msg != "": @@ -687,7 +687,7 @@ def get_meeting_info(request: WSGIRequest, meeting_id: str) -> JsonResponse: for key in args: msg += "%s: %s
" % (key, args[key]) msg = mark_safe(msg) - if request.is_ajax(): + if is_ajax(request): return JsonResponse({"info": info, "msg": msg}, safe=False) else: if msg != "": @@ -823,7 +823,7 @@ def internal_recording( recordings = get_internal_recordings(request, meeting_id, recording_id) # JSON format data = recordings[0].to_json() - if request.is_ajax(): + if is_ajax(request): return HttpResponse(data, content_type="application/json") else: return HttpResponseBadRequest() diff --git a/pod/meeting/webinar.py b/pod/meeting/webinar.py index ea72b191e8..e662460ab9 100644 --- a/pod/meeting/webinar.py +++ b/pod/meeting/webinar.py @@ -9,7 +9,7 @@ from django.contrib import messages from django.core.handlers.wsgi import WSGIRequest from django.utils.html import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.utils import display_message_with_icon from pod.meeting.models import Meeting, Livestream from pod.meeting.utils import slash_join diff --git a/pod/meeting/webinar_utils.py b/pod/meeting/webinar_utils.py index 0d49ffd14b..f89d31f94f 100644 --- a/pod/meeting/webinar_utils.py +++ b/pod/meeting/webinar_utils.py @@ -5,7 +5,7 @@ from django.core.handlers.wsgi import WSGIRequest from django.core.mail import mail_admins from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Meeting, LiveGateway, Livestream from pod.live.models import Event from pod.main.views import TEMPLATE_VISIBLE_SETTINGS diff --git a/pod/playlist/context_processors.py b/pod/playlist/context_processors.py index c171ddd72a..60d1fe01e5 100644 --- a/pod/playlist/context_processors.py +++ b/pod/playlist/context_processors.py @@ -2,9 +2,9 @@ from django.conf import settings as django_settings -USE_PLAYLIST = getattr(django_settings, "USE_PLAYLIST", True) -USE_PROMOTED_PLAYLIST = getattr(django_settings, "USE_PROMOTED_PLAYLIST", True) -USE_FAVORITES = getattr(django_settings, "USE_FAVORITES", True) +USE_PLAYLIST = getattr(django_settings, "USE_PLAYLIST", False) +USE_PROMOTED_PLAYLIST = getattr(django_settings, "USE_PROMOTED_PLAYLIST", False) +USE_FAVORITES = getattr(django_settings, "USE_FAVORITES", False) DEFAULT_PLAYLIST_THUMBNAIL = getattr( django_settings, "DEFAULT_PLAYLIST_THUMBNAIL", diff --git a/pod/playlist/forms.py b/pod/playlist/forms.py index a684b7ec92..60783031c8 100644 --- a/pod/playlist/forms.py +++ b/pod/playlist/forms.py @@ -4,7 +4,7 @@ from django.conf import settings from django.core.exceptions import ValidationError from django.db.models.query import QuerySet -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.forms_utils import add_placeholder_and_asterisk from pod.meeting.forms import AddOwnerWidget @@ -12,7 +12,7 @@ from .apps import FAVORITE_PLAYLIST_NAME from .models import Playlist -USE_PROMOTED_PLAYLIST = getattr(settings, "USE_PROMOTED_PLAYLIST", True) +USE_PROMOTED_PLAYLIST = getattr(settings, "USE_PROMOTED_PLAYLIST", False) RESTRICT_PROMOTED_PLAYLIST_ACCESS_TO_STAFF_ONLY = getattr( settings, "RESTRICT_PROMOTED_PLAYLIST_ACCESS_TO_STAFF_ONLY", diff --git a/pod/playlist/signals.py b/pod/playlist/signals.py index 45074dba51..8d0b562dc2 100644 --- a/pod/playlist/signals.py +++ b/pod/playlist/signals.py @@ -3,7 +3,7 @@ from django.contrib.sites.models import Site from django.db.models.signals import m2m_changed from django.dispatch import receiver -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.authentication.models import Owner diff --git a/pod/playlist/templatetags/favorites_playlist.py b/pod/playlist/templatetags/favorites_playlist.py index 1be76a79b4..76878017ce 100644 --- a/pod/playlist/templatetags/favorites_playlist.py +++ b/pod/playlist/templatetags/favorites_playlist.py @@ -2,7 +2,7 @@ from django.template import Library from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Video diff --git a/pod/playlist/views.py b/pod/playlist/views.py index 53f794fb50..a2fe54b907 100644 --- a/pod/playlist/views.py +++ b/pod/playlist/views.py @@ -9,7 +9,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.http import HttpResponseRedirect from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.shortcuts import get_object_or_404, redirect, render from django.template.loader import render_to_string from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie @@ -75,7 +75,7 @@ else "Pod" ) -USE_PROMOTED_PLAYLIST = getattr(settings, "USE_PROMOTED_PLAYLIST", True) +USE_PROMOTED_PLAYLIST = getattr(settings, "USE_PROMOTED_PLAYLIST", False) def playlist_list(request: WSGIRequest): diff --git a/pod/podfile/forms.py b/pod/podfile/forms.py index d14f0db972..c130e8e194 100644 --- a/pod/podfile/forms.py +++ b/pod/podfile/forms.py @@ -4,7 +4,7 @@ from django.conf import settings from django.core.validators import FileExtensionValidator from django.utils.deconstruct import deconstructible -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import filesizeformat from django.core.exceptions import ValidationError diff --git a/pod/podfile/urls.py b/pod/podfile/urls.py index 2053af91a4..ad14398f44 100644 --- a/pod/podfile/urls.py +++ b/pod/podfile/urls.py @@ -1,6 +1,6 @@ """Esup-Pod podfile URL Configuration.""" -from django.conf.urls import url +from django.urls import re_path from .views import home, get_folder_files, get_file from .views import editfolder, deletefolder @@ -16,28 +16,28 @@ app_name = "podfile" urlpatterns = [ - url(r"^$", home, name="home"), - url(r"^(?P[\-\d\w]+)$", home, name="home"), - url( + re_path(r"^$", home, name="home"), + re_path(r"^(?P[\-\d\w]+)$", home, name="home"), + re_path( r"^get_folder_files/(?P[\d]+)/$", get_folder_files, name="get_folder_files", ), - url( + re_path( r"^get_folder_files/(?P[\d]+)/(?P[\-\d\w]+)/$", get_folder_files, name="get_folder_files", ), - url(r"^get_file/(?P[\-\d\w]+)/$", get_file, name="get_file"), - url(r"^editfolder/$", editfolder, name="editfolder"), - url(r"^deletefolder/$", deletefolder, name="deletefolder"), - url(r"^deletefile/$", deletefile, name="deletefile"), - url(r"^changefile/$", changefile, name="changefile"), - url(r"^uploadfiles/$", uploadfiles, name="uploadfiles"), - url(r"^ajax_calls/search_share_user/", user_share_autocomplete), - url(r"^ajax_calls/folder_shared_with/", folder_shared_with), - url(r"^ajax_calls/remove_shared_user/", remove_shared_user), - url(r"^ajax_calls/add_shared_user/", add_shared_user), - url(r"^ajax_calls/user_folders/", user_folders), - url(r"^ajax_calls/current_session_folder/", get_current_session_folder_ajax), + re_path(r"^get_file/(?P[\-\d\w]+)/$", get_file, name="get_file"), + re_path(r"^editfolder/$", editfolder, name="editfolder"), + re_path(r"^deletefolder/$", deletefolder, name="deletefolder"), + re_path(r"^deletefile/$", deletefile, name="deletefile"), + re_path(r"^changefile/$", changefile, name="changefile"), + re_path(r"^uploadfiles/$", uploadfiles, name="uploadfiles"), + re_path(r"^ajax_calls/search_share_user/", user_share_autocomplete), + re_path(r"^ajax_calls/folder_shared_with/", folder_shared_with), + re_path(r"^ajax_calls/remove_shared_user/", remove_shared_user), + re_path(r"^ajax_calls/add_shared_user/", add_shared_user), + re_path(r"^ajax_calls/user_folders/", user_folders), + re_path(r"^ajax_calls/current_session_folder/", get_current_session_folder_ajax), ] diff --git a/pod/podfile/views.py b/pod/podfile/views.py index 9d3e688ed0..4d4fb4c51f 100644 --- a/pod/podfile/views.py +++ b/pod/podfile/views.py @@ -6,7 +6,7 @@ from django.views.decorators.csrf import csrf_protect from django.contrib import messages from django.shortcuts import get_object_or_404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.exceptions import PermissionDenied from django.template.loader import render_to_string from django.contrib.admin.views.decorators import staff_member_required diff --git a/pod/quiz/context_processors.py b/pod/quiz/context_processors.py index 303f5fed8a..a268af14b5 100644 --- a/pod/quiz/context_processors.py +++ b/pod/quiz/context_processors.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings -USE_QUIZ = getattr(django_settings, "USE_QUIZ", True) +USE_QUIZ = getattr(django_settings, "USE_QUIZ", False) def context_settings(request): diff --git a/pod/quiz/tests/test_views.py b/pod/quiz/tests/test_views.py index 7d7ed5ce88..4d72b1caf0 100644 --- a/pod/quiz/tests/test_views.py +++ b/pod/quiz/tests/test_views.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.urls import reverse from django.contrib.messages import get_messages -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.models import Configuration from pod.quiz.forms import QuizDeleteForm, QuizForm diff --git a/pod/recorder/admin.py b/pod/recorder/admin.py index c83848d345..c3526b358e 100644 --- a/pod/recorder/admin.py +++ b/pod/recorder/admin.py @@ -4,7 +4,7 @@ from django.conf import settings from django.contrib import admin from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Recording, Recorder, RecordingFile from .models import RecordingFileTreatment from django.contrib.sites.shortcuts import get_current_site diff --git a/pod/recorder/forms.py b/pod/recorder/forms.py index e4dc8f91e7..b9e538315f 100644 --- a/pod/recorder/forms.py +++ b/pod/recorder/forms.py @@ -1,7 +1,7 @@ from django import forms from django.conf import settings from django.core.exceptions import ObjectDoesNotExist -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.sites.models import Site from .models import Recording, Recorder from pod.main.forms_utils import add_placeholder_and_asterisk diff --git a/pod/recorder/models.py b/pod/recorder/models.py index a4dd9b8f99..3313567e53 100644 --- a/pod/recorder/models.py +++ b/pod/recorder/models.py @@ -6,7 +6,7 @@ from ckeditor.fields import RichTextField from django.db import models from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth.models import User from django.contrib.auth.models import Group from django.dispatch import receiver @@ -23,7 +23,7 @@ from pod.video.models import CURSUS_CODES as __CURSUS_CODES__ from pod.video.models import LICENCE_CHOICES as __LICENCE_CHOICES__ from pod.video.models import RESTRICT_EDIT_VIDEO_ACCESS_TO_STAFF_ONLY as __REVATSO__ -from tagging.fields import TagField +from tagulous.models import TagField from django.utils.translation import get_language LANG_CHOICES = getattr( diff --git a/pod/recorder/studio_urls.py b/pod/recorder/studio_urls.py index f0447a44b6..c6423c3319 100644 --- a/pod/recorder/studio_urls.py +++ b/pod/recorder/studio_urls.py @@ -1,6 +1,6 @@ """Opencast Studio urls for Esup-Pod Integration.""" -from django.conf.urls import url +from django.urls import re_path from .views import studio_pod, studio_static, studio_root_file from .views import ingest_createMediaPackage, ingest_addDCCatalog from .views import ingest_addAttachment, ingest_addTrack @@ -9,62 +9,62 @@ app_name = "recorder" urlpatterns = [ - url( + re_path( r"^$", studio_pod, name="studio_pod", ), - url( + re_path( r"^presenter_post$", presenter_post, name="presenter_post", ), - url( + re_path( r"^settings.toml$", settings_toml, name="settings_toml", ), - url( + re_path( r"^info/me.json$", info_me_json, name="info_me_json", ), - url( + re_path( r"^static/(?P.*)$", studio_static, name="studio_static", ), - url( + re_path( r"^(?P[a-zA-Z0-9\.]*)$", studio_root_file, name="studio_root_file", ), - url( + re_path( r"^ingest/createMediaPackage$", ingest_createMediaPackage, name="ingest_createMediaPackage", ), - url( + re_path( r"^ingest/addDCCatalog$", ingest_addDCCatalog, name="ingest_addDCCatalog", ), - url( + re_path( r"^ingest/addAttachment$", ingest_addAttachment, name="ingest_addAttachment", ), - url( + re_path( r"^ingest/addTrack$", ingest_addTrack, name="ingest_addTrack", ), - url( + re_path( r"^ingest/addCatalog$", ingest_addCatalog, name="ingest_addCatalog", ), - url( + re_path( r"^ingest/ingest$", ingest_ingest, name="ingest_ingest", diff --git a/pod/recorder/studio_urls_digest.py b/pod/recorder/studio_urls_digest.py index 04b10c993a..d9cfc30d54 100644 --- a/pod/recorder/studio_urls_digest.py +++ b/pod/recorder/studio_urls_digest.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import re_path from pod.recorder.views import ( digest_admin_ng_series, @@ -20,77 +20,77 @@ app_name = "recorder_digest" urlpatterns = [ - url( + re_path( r"^services/hosts.json$", digest_hosts_json, name="hosts_json", ), - url( + re_path( r"^capture-admin/agents/(?P.+)/configuration$", digest_capture_admin_configuration, name="capture_admin_config", ), - url( + re_path( r"^capture-admin/agents/(?P.*)$", digest_capture_admin, name="capture_admin_agent", ), - url( + re_path( r"^admin-ng/series/series.json$", digest_admin_ng_series, name="admin_ng_series", ), - url( + re_path( r"^services/available.json$", digest_available, name="services_available", ), - url( + re_path( r"^presenter_post$", digest_presenter_post, name="presenter_post", ), - url( + re_path( r"^settings.toml$", digest_settings_toml, name="settings_toml", ), - url( + re_path( r"^info/me.json$", digest_info_me_json, name="info_me_json", ), - url( + re_path( r"^static/(?P.*)$", digest_studio_static, name="studio_static", ), - url( + re_path( r"^ingest/createMediaPackage$", digest_ingest_createMediaPackage, name="ingest_createMediaPackage", ), - url( + re_path( r"^ingest/addDCCatalog$", digest_ingest_addDCCatalog, name="ingest_addDCCatalog", ), - url( + re_path( r"^ingest/addAttachment$", digest_ingest_addAttachment, name="ingest_addAttachment", ), - url( + re_path( r"^ingest/addTrack$", digest_ingest_addTrack, name="ingest_addTrack", ), - url( + re_path( r"^ingest/addCatalog$", digest_ingest_addCatalog, name="ingest_addCatalog", ), - url( + re_path( r"^ingest/ingest$", digest_ingest_ingest, name="ingest_ingest", diff --git a/pod/recorder/views.py b/pod/recorder/views.py index 4fa5dc4cd4..c3578377da 100644 --- a/pod/recorder/views.py +++ b/pod/recorder/views.py @@ -35,12 +35,13 @@ from django.template.defaultfilters import truncatechars from django.template.loader import render_to_string from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_protect from django.views.decorators.http import require_http_methods from pod.main.views import in_maintenance, TEMPLATE_VISIBLE_SETTINGS +from pod.main.utils import is_ajax from pod.recorder.models import Recorder, Recording, RecordingFileTreatment from .forms import RecordingForm, RecordingFileTreatmentDeleteForm from .models import __REVATSO__ @@ -353,7 +354,7 @@ def claim_record(request): except EmptyPage: records = paginator.page(paginator.num_pages) - if request.is_ajax(): + if is_ajax(request): return render( request, "recorder/record_list.html", diff --git a/pod/settings.py b/pod/settings.py index 2590e3c855..1709c21511 100644 --- a/pod/settings.py +++ b/pod/settings.py @@ -7,13 +7,24 @@ import os import importlib.util +# DEPRECATIONS HACKS +import django +from django.utils.translation import gettext +from urllib.parse import quote + +# Needed for django-cas-client==1.5.3 +django.utils.http.urlquote = quote + +# Needed for django-chunked-upload==2.0.0 +django.utils.translation.ugettext = gettext + BASE_DIR = os.path.dirname(os.path.dirname(__file__)) # will be update in pod/main/settings.py ## # Version of the project # -VERSION = "3.8.1" +VERSION = "4.0.0--ALPHA" ## # Installed applications list @@ -33,7 +44,8 @@ # Exterior Applications "ckeditor", "sorl.thumbnail", - "tagging", + # "tagging", + "tagulous", "cas", "captcha", "rest_framework", @@ -491,3 +503,18 @@ def show_toolbar(request): and importlib.util.find_spec("django_extensions") is not None ): INSTALLED_APPS.append("django_extensions") + + +# Django Tag manager +SERIALIZATION_MODULES = { + "xml": "tagulous.serializers.xml_serializer", + "json": "tagulous.serializers.json", + "python": "tagulous.serializers.python", + "yaml": "tagulous.serializers.pyyaml", +} +# see https://django-tagulous.readthedocs.io/en/latest/installation.html#settings +TAGULOUS_NAME_MAX_LENGTH = 80 +""" +TAGULOUS_SLUG_MAX_LENGTH = 50 +TAGULOUS_LABEL_MAX_LENGTH = TAGULOUS_NAME_MAX_LENGTH +""" diff --git a/pod/speaker/forms.py b/pod/speaker/forms.py index 409ba4ee2f..88555bf0a2 100644 --- a/pod/speaker/forms.py +++ b/pod/speaker/forms.py @@ -1,7 +1,7 @@ """Esup-Pod forms speaker.""" from django_select2 import forms as s2forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django import forms from django.forms.widgets import HiddenInput from .models import Speaker, Job, JobVideo diff --git a/pod/urls.py b/pod/urls.py index 6a66b8afed..e96b480c6f 100644 --- a/pod/urls.py +++ b/pod/urls.py @@ -1,14 +1,13 @@ """Esup-pod URL configuration.""" from django.conf import settings -from django.conf.urls import url from django.conf.urls import include -from django.urls import path +from django.urls import path, re_path from django.conf.urls.static import static from django.contrib import admin from django.contrib.auth import views as auth_views from django.views.i18n import JavaScriptCatalog -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import importlib.util @@ -27,17 +26,17 @@ USE_CAS = getattr(settings, "USE_CAS", False) USE_SHIB = getattr(settings, "USE_SHIB", False) USE_OIDC = getattr(settings, "USE_OIDC", False) -USE_NOTIFICATIONS = getattr(settings, "USE_NOTIFICATIONS", True) -USE_CUT = getattr(settings, "USE_CUT", True) +USE_NOTIFICATIONS = getattr(settings, "USE_NOTIFICATIONS", False) +USE_CUT = getattr(settings, "USE_CUT", False) USE_MEETING = getattr(settings, "USE_MEETING", False) USE_XAPI = getattr(settings, "USE_XAPI", False) USE_OPENCAST_STUDIO = getattr(settings, "USE_OPENCAST_STUDIO", False) USE_PODFILE = getattr(settings, "USE_PODFILE", False) -USE_PLAYLIST = getattr(settings, "USE_PLAYLIST", True) -USE_DRESSING = getattr(settings, "USE_DRESSING", True) +USE_PLAYLIST = getattr(settings, "USE_PLAYLIST", False) +USE_DRESSING = getattr(settings, "USE_DRESSING", False) USE_SPEAKER = getattr(settings, "USE_SPEAKER", False) -USE_IMPORT_VIDEO = getattr(settings, "USE_IMPORT_VIDEO", True) -USE_QUIZ = getattr(settings, "USE_QUIZ", True) +USE_IMPORT_VIDEO = getattr(settings, "USE_IMPORT_VIDEO", False) +USE_QUIZ = getattr(settings, "USE_QUIZ", False) USE_AI_ENHANCEMENT = getattr(settings, "USE_AI_ENHANCEMENT", False) if USE_CAS: @@ -45,75 +44,75 @@ urlpatterns = [ - url("select2/", include("django_select2.urls")), - url("robots.txt", robots_txt), - url("info_pod.json", info_pod), - url(r"^admin/", admin.site.urls), + re_path("select2/", include("django_select2.urls")), + re_path("robots.txt", robots_txt), + re_path("info_pod.json", info_pod), + re_path(r"^admin/", admin.site.urls), # Translation - url(r"^i18n/", include("django.conf.urls.i18n")), - url(r"^jsi18n/$", JavaScriptCatalog.as_view(), name="javascript-catalog"), + re_path(r"^i18n/", include("django.conf.urls.i18n")), + re_path(r"^jsi18n/$", JavaScriptCatalog.as_view(), name="javascript-catalog"), # Maintenance mode - url(r"^maintenance/$", maintenance, name="maintenance"), + re_path(r"^maintenance/$", maintenance, name="maintenance"), # videos - url(r"^videos/", include("pod.video.urls-videos")), - url(r"^rss", include("pod.video.urls-rss")), - url(r"^video/", include("pod.video.urls")), - url(r"^ajax_calls/search_user/", user_autocomplete), + re_path(r"^videos/", include("pod.video.urls-videos")), + re_path(r"^rss", include("pod.video.urls-rss")), + re_path(r"^video/", include("pod.video.urls")), + re_path(r"^ajax_calls/search_user/", user_autocomplete), # my channels - url(r"^channels/", include("pod.video.urls-channels")), + re_path(r"^channels/", include("pod.video.urls-channels")), # recording - url(r"^record/", include("pod.recorder.urls")), + re_path(r"^record/", include("pod.recorder.urls")), # search - url(r"^search/", include("pod.video_search.urls")), - url(r"^authentication_", include("pod.authentication.urls")), - url( + re_path(r"^search/", include("pod.video_search.urls")), + re_path(r"^authentication_", include("pod.authentication.urls")), + re_path( r"^accounts/login/$", auth_views.LoginView.as_view(), {"redirect_authenticated_user": True}, name="local-login", ), - url( + re_path( r"^accounts/logout/$", auth_views.LogoutView.as_view(), {"next_page": "/"}, name="local-logout", ), - url(r"^accounts/change-password/$", auth_views.PasswordChangeView.as_view()), - url(r"^accounts/reset-password/$", auth_views.PasswordResetView.as_view()), - url(r"^accounts/userpicture/$", userpicture, name="userpicture"), - url(r"^accounts/set-notifications/$", set_notifications, name="set_notifications"), + re_path(r"^accounts/change-password/$", auth_views.PasswordChangeView.as_view()), + re_path(r"^accounts/reset-password/$", auth_views.PasswordResetView.as_view()), + re_path(r"^accounts/userpicture/$", userpicture, name="userpicture"), + re_path(r"^accounts/set-notifications/$", set_notifications, name="set_notifications"), # rest framework - url(r"^api-auth/", include("rest_framework.urls")), - url(r"^rest/", include(rest_urlpatterns)), + re_path(r"^api-auth/", include("rest_framework.urls")), + re_path(r"^rest/", include(rest_urlpatterns)), # contact_us - url(r"^contact_us/$", contact_us, name="contact_us"), - url(r"^captcha/", include("captcha.urls")), - url(r"^download/$", download_file, name="download_file"), + re_path(r"^contact_us/$", contact_us, name="contact_us"), + re_path(r"^captcha/", include("captcha.urls")), + re_path(r"^download/$", download_file, name="download_file"), # custom - url(r"^custom/", include("pod.custom.urls")), + re_path(r"^custom/", include("pod.custom.urls")), # pwa - url("", include("pwa.urls")), + re_path("", include("pwa.urls")), ] # WEBPUSH if USE_NOTIFICATIONS: urlpatterns += [ # webpush - url(r"^webpush/", include("webpush.urls")), + re_path(r"^webpush/", include("webpush.urls")), ] # CAS if USE_CAS: - # urlpatterns += [url(r'^sso-cas/', include('cas.urls')), ] + # urlpatterns += [re_path(r'^sso-cas/', include('cas.urls')), ] urlpatterns += [ - url(r"^sso-cas/login/$", cas_views.login, name="cas-login"), - url(r"^sso-cas/logout/$", cas_views.logout, name="cas-logout"), + re_path(r"^sso-cas/login/$", cas_views.login, name="cas-login"), + re_path(r"^sso-cas/logout/$", cas_views.logout, name="cas-logout"), ] # OIDC if USE_OIDC: urlpatterns += [ - url(r"^oidc/", include("mozilla_django_oidc.urls")), + re_path(r"^oidc/", include("mozilla_django_oidc.urls")), ] # PWA @@ -125,30 +124,30 @@ if USE_MEETING: urlpatterns += [ - url(r"^meeting/", include("pod.meeting.urls")), + re_path(r"^meeting/", include("pod.meeting.urls")), ] if USE_XAPI: urlpatterns += [ - url(r"^xapi/", include("pod.xapi.urls")), + re_path(r"^xapi/", include("pod.xapi.urls")), ] # RECORDER if USE_OPENCAST_STUDIO: urlpatterns += [ - url(r"^studio/", include("pod.recorder.studio_urls")), - url(r"^digest/studio/", include("pod.recorder.studio_urls_digest")), + re_path(r"^studio/", include("pod.recorder.studio_urls")), + re_path(r"^digest/studio/", include("pod.recorder.studio_urls_digest")), ] # PODFILE if USE_PODFILE: urlpatterns += [ - url(r"^podfile/", include("pod.podfile.urls")), + re_path(r"^podfile/", include("pod.podfile.urls")), ] for apps in settings.THIRD_PARTY_APPS: urlpatterns += [ - url(r"^" + apps + "/", include("pod.%s.urls" % apps, namespace=apps)), + re_path(r"^" + apps + "/", include("pod.%s.urls" % apps, namespace=apps)), ] # CUT @@ -193,7 +192,7 @@ # IMPORT_VIDEO if USE_IMPORT_VIDEO: urlpatterns += [ - url( + re_path( r"^import_video/", include("pod.import_video.urls", namespace="import_video") ), ] @@ -207,7 +206,7 @@ # CHANNELS urlpatterns += [ - url(r"^", include("pod.video.urls-channels-video")), + re_path(r"^", include("pod.video.urls-channels-video")), ] # Change admin site title diff --git a/pod/video/admin.py b/pod/video/admin.py index 4ab2adf5d3..24d859a6fe 100644 --- a/pod/video/admin.py +++ b/pod/video/admin.py @@ -7,7 +7,7 @@ from django.urls import reverse from django.utils.html import format_html from django.utils.html import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from modeltranslation.admin import TranslationAdmin from .models import Video diff --git a/pod/video/feeds.py b/pod/video/feeds.py index c5377e7017..f5d81a4115 100644 --- a/pod/video/feeds.py +++ b/pod/video/feeds.py @@ -5,7 +5,7 @@ # from datetime import datetime from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.sites.shortcuts import get_current_site from django.urls import reverse from django.shortcuts import get_object_or_404 diff --git a/pod/video/forms.py b/pod/video/forms.py index ceff349e65..a3777010fa 100644 --- a/pod/video/forms.py +++ b/pod/video/forms.py @@ -8,7 +8,7 @@ from django.core.exceptions import ValidationError from django.forms.widgets import ClearableFileInput from django.utils.deconstruct import deconstructible -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import filesizeformat from .models import Video, VideoVersion from .models import Channel diff --git a/pod/video/models.py b/pod/video/models.py index 606937d8d9..9352d81535 100644 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -12,7 +12,7 @@ from django.db import models from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.translation import get_language from django.template.defaultfilters import slugify from django.db.models import Sum @@ -24,13 +24,13 @@ from django.templatetags.static import static from django.dispatch import receiver from django.db.models.signals import pre_delete, post_delete -from tagging.models import Tag +# from tagging.models import Tag +from tagulous.models import TagField from datetime import date from django.utils import timezone from django.utils.html import format_html, escape from django.utils.text import capfirst from ckeditor.fields import RichTextField -from tagging.fields import TagField from django.contrib.sites.models import Site from django.db.models.signals import post_save from django.db.models.signals import pre_save @@ -909,7 +909,6 @@ def save(self, *args, **kwargs) -> None: newid = self.id newid = "%04d" % newid self.slug = "%s-%s" % (newid, slugify(self.title)) - self.tags = remove_accents(self.tags) # self.set_password() super(Video, self).save(*args, **kwargs) # Ensure video folder will accord access to additional owners @@ -1273,12 +1272,15 @@ def get_json_to_index(self) -> str: "description": "%s" % self.description, "thumbnail": "%s" % self.get_thumbnail_url(), "duration": "%s" % self.duration, + """ "tags": list( [ {"name": name[0], "slug": slugify(name)} for name in Tag.objects.get_for_object(self).values_list("name") ] ), + """ + "tags": self.tags.all().filter(site=current_site).values("title", "slug"), "type": {"title": self.type.title, "slug": self.type.slug}, "disciplines": list( self.discipline.all() diff --git a/pod/video/templates/videos/add_video.html b/pod/video/templates/videos/add_video.html index ec05b7a930..0f489b9ed9 100644 --- a/pod/video/templates/videos/add_video.html +++ b/pod/video/templates/videos/add_video.html @@ -1,7 +1,6 @@ {% extends 'base.html' %} {% load i18n %} {% load static %} -{% load tagging_tags %} {% block breadcrumbs %}{{ block.super }}
  • {% trans "Dashboard" %}
    • diff --git a/pod/video/templates/videos/filter_aside.html b/pod/video/templates/videos/filter_aside.html index bb7f78abb6..a29306a2e1 100644 --- a/pod/video/templates/videos/filter_aside.html +++ b/pod/video/templates/videos/filter_aside.html @@ -95,28 +95,7 @@

     {% trans 'Tags' %}
    - {% tags_for_model video.Video as tagscloud with counts %} - {% with tagslist=tagscloud|dictsortreversed:"count"|slice:":20" %} -
    - {% for tag in tagslist %} -
    - - -
    - {% endfor %} -
    - {% if tagslist|length > 5 %} - - - - {% endif %} - {% endwith %} + TODO: DISPLAY TAG CLOUD HERE.
    {% endif %} diff --git a/pod/video/templates/videos/video-all-info.html b/pod/video/templates/videos/video-all-info.html index b5e406d266..c96870943f 100644 --- a/pod/video/templates/videos/video-all-info.html +++ b/pod/video/templates/videos/video-all-info.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load tagging_tags %}

    @@ -19,7 +18,7 @@

    {% endspaceless %} - diff --git a/pod/video/templatetags/video_tags.py b/pod/video/templatetags/video_tags.py index b210af4526..05e5b5606b 100644 --- a/pod/video/templatetags/video_tags.py +++ b/pod/video/templatetags/video_tags.py @@ -5,13 +5,13 @@ from django.urls import reverse from django.contrib.sites.shortcuts import get_current_site from django.template import TemplateSyntaxError -from django.apps.registry import apps -from django.utils.translation import ugettext_lazy as _ +# from django.apps.registry import apps +from django.utils.translation import gettext_lazy as _ -from tagging.templatetags.tagging_tags import TagsForModelNode, TagCloudForModelNode -from tagging.models import Tag -from tagging.utils import LINEAR -from tagging.utils import LOGARITHMIC +# from tagging.templatetags.tagging_tags import TagsForModelNode, TagCloudForModelNode +# from tagging.models import Tag +# from tagging.utils import LINEAR +# from tagging.utils import LOGARITHMIC from ..forms import VideoVersionForm from pod.video_encode_transcript.utils import check_file @@ -150,7 +150,7 @@ def get_video_infos(video): }, } - +""" class getTagsForModelNode(TagsForModelNode): def __init__(self, model, context_var, counts): super(getTagsForModelNode, self).__init__(model, context_var, counts) @@ -171,7 +171,7 @@ def render(self, context): def do_tags_for_model(parser, token): - """ + ### Retrieve a list of `Tag` objects associated with a given model. and stores them in a context variable. @@ -195,7 +195,7 @@ def do_tags_for_model(parser, token): {% tags_for_model products.Widget as widget_tags %} {% tags_for_model products.Widget as widget_tags with counts %} - """ + ### bits = token.contents.split() len_bits = len(bits) if len_bits not in (4, 6): @@ -217,7 +217,7 @@ def do_tags_for_model(parser, token): return getTagsForModelNode(bits[1], bits[3], counts=False) else: return getTagsForModelNode(bits[1], bits[3], counts=True) - +""" def do_tag_cloud_for_model(parser, token): """ @@ -339,5 +339,5 @@ def update_kwargs_from_bits(kwargs, name, value, bits): return kwargs -register.tag("tags_for_model", do_tags_for_model) -register.tag("tag_cloud_for_model", do_tag_cloud_for_model) +# register.tag("tags_for_model", do_tags_for_model) +# register.tag("tag_cloud_for_model", do_tag_cloud_for_model) diff --git a/pod/video/tests/test_models.py b/pod/video/tests/test_models.py index 5dc39a9ddd..c50a9387f4 100644 --- a/pod/video/tests/test_models.py +++ b/pod/video/tests/test_models.py @@ -10,7 +10,7 @@ from django.db.utils import IntegrityError from django.template.defaultfilters import slugify from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.urls import reverse from django.conf import settings from django.core.exceptions import ValidationError diff --git a/pod/video/tests/test_views.py b/pod/video/tests/test_views.py index 9519ea1179..3593a4d587 100644 --- a/pod/video/tests/test_views.py +++ b/pod/video/tests/test_views.py @@ -11,7 +11,7 @@ from django.contrib.sites.models import Site from django.contrib.messages import get_messages from django.core.files.temp import NamedTemporaryFile -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.main.models import AdditionalChannelTab diff --git a/pod/video/translation.py b/pod/video/translation.py index c8b2c5f23a..6dcfec9158 100644 --- a/pod/video/translation.py +++ b/pod/video/translation.py @@ -1,5 +1,5 @@ from modeltranslation.translator import translator, TranslationOptions -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from pod.video.models import Channel from pod.video.models import Video diff --git a/pod/video/urls-rss.py b/pod/video/urls-rss.py index fd31717608..d358817b6f 100644 --- a/pod/video/urls-rss.py +++ b/pod/video/urls-rss.py @@ -1,27 +1,27 @@ -from django.conf.urls import url +from django.urls import re_path from .feeds import RssSiteVideosFeed, RssSiteAudiosFeed app_name = "rss-video" urlpatterns = [ - url(r"^-video/$", RssSiteVideosFeed(), name="rss-video"), - url(r"^-audio/$", RssSiteAudiosFeed(), name="rss-audio"), - url( + re_path(r"^-video/$", RssSiteVideosFeed(), name="rss-video"), + re_path(r"^-audio/$", RssSiteAudiosFeed(), name="rss-audio"), + re_path( r"^-video/(?P[\-\d\w]+)/$", RssSiteVideosFeed(), name="rss-video", ), - url( + re_path( r"^-audio/(?P[\-\d\w]+)/$", RssSiteAudiosFeed(), name="rss-audio", ), - url( + re_path( r"^-video/(?P[\-\d\w]+)/(?P[\-\d\w]+)/$", RssSiteVideosFeed(), name="rss-video", ), - url( + re_path( r"^-audio/(?P[\-\d\w]+)/(?P[\-\d\w]+)/$", RssSiteAudiosFeed(), name="rss-audio", diff --git a/pod/video/urls.py b/pod/video/urls.py index 99525a0308..4a026fdc23 100644 --- a/pod/video/urls.py +++ b/pod/video/urls.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.conf.urls import url +from django.urls import re_path from django.urls import include, path from .views import ( @@ -42,45 +42,45 @@ urlpatterns = [ # Manage video owner - url( + re_path( r"^updateowner/put/(?P[\d]+)/$", update_video_owner, name="update_video_owner", ), - url(r"^updateowner/owners/$", filter_owners, name="filter_owners"), - url( + re_path(r"^updateowner/owners/$", filter_owners, name="filter_owners"), + re_path( r"^updateowner/videos/(?P[\d]+)/$", filter_videos, name="filter_videos", ), - url(r"^add/$", video_add, name="video_add"), - url(r"^edit/$", video_edit, name="video_edit"), - url(r"^edit/(?P[\-\d\w]+)/$", video_edit, name="video_edit"), - url( + re_path(r"^add/$", video_add, name="video_add"), + re_path(r"^edit/$", video_edit, name="video_edit"), + re_path(r"^edit/(?P[\-\d\w]+)/$", video_edit, name="video_edit"), + re_path( r"^edit_access_tokens/(?P[\-\d\w]+)/$", video_edit_access_tokens, name="video_edit_access_tokens", ), - url( + re_path( r"^delete/(?P[\-\d\w]+)/$", video_delete, name="video_delete", ), - url( + re_path( r"^transcript/(?P[\-\d\w]+)/$", video_transcript, name="video_transcript", ), - url(r"^notes/(?P[\-\d\w]+)/$", video_notes, name="video_notes"), - url(r"^count/(?P[\d]+)/$", video_count, name="video_count"), - url(r"^marker/(?P[\d]+)/(?P