From 2d982a819bf2117b901167eeeba72e323bb4f949 Mon Sep 17 00:00:00 2001 From: Olivier Bado-Faustin Date: Thu, 15 Feb 2024 10:23:39 +0100 Subject: [PATCH] [DONE] Fix dressing Watermark path (#1048) * * Replace `settings.BASE_DIR` by watermark.file.path for video dressing watermark * Some code formatting & docs * Send email to admin on encoding error * * Setup of Video & Audio encoding test case is only called once (This testCase will be 4x faster) * another try to run setup only once * Fix small bug * correct typo * small correction * modify encoding test * * Polish `change video owner` template * move every "mandatory fields" help messagre in a main template to be included * Small change on encoding error handling * Minor QoC * correct typos * Corrections after peer review: * Use django url block * Use {{ owner }} and {{ user }} default str * Various QoC * Add missing parameter types * Specify types of some lists in functions hints * Remove every list content type hint, as they appear only in python >= 3.9 --- pod/bbb/templates/bbb/list_meeting.html | 10 +- pod/bbb/templates/bbb/live_list_meeting.html | 2 +- pod/bbb/tests/test_models.py | 3 +- pod/chapter/templates/video_chapter.html | 32 +-- .../templates/video_caption_maker.html | 4 +- .../templates/video_completion.html | 2 +- pod/cut/templates/video_cut.html | 11 +- pod/dressing/admin.py | 4 + pod/dressing/apps.py | 4 + pod/dressing/forms.py | 18 +- pod/dressing/models.py | 4 +- pod/dressing/templates/dressing_edit.html | 7 +- pod/dressing/templates/my_dressings.html | 68 ++---- pod/dressing/templates/video_dressing.html | 37 ++- pod/dressing/tests/test_models.py | 2 + pod/dressing/tests/test_utils.py | 3 +- pod/dressing/tests/test_views.py | 3 +- pod/dressing/urls.py | 2 + pod/dressing/utils.py | 12 +- .../enrichment/group_enrichment.html | 2 +- .../templates/import_video/list.html | 10 +- pod/import_video/tests/test_models.py | 2 +- pod/live/live_transcript.py | 4 +- pod/live/templates/live/directs.html | 2 +- pod/live/templates/live/event-info.html | 2 +- pod/live/templates/live/event.html | 10 +- pod/live/templates/live/event_edit.html | 11 +- .../templates/live/event_immediate_edit.html | 228 ++++++++---------- pod/live/utils.py | 16 +- pod/locale/fr/LC_MESSAGES/django.mo | Bin 179166 -> 179927 bytes pod/locale/fr/LC_MESSAGES/django.po | 60 +++-- pod/locale/nl/LC_MESSAGES/django.po | 48 ++-- pod/main/configuration.json | 4 +- pod/main/templates/base.html | 2 +- pod/main/templates/contact_us.html | 21 +- pod/main/templates/footer.html | 2 +- pod/main/templates/main/mandatory_fields.html | 10 + pod/main/templates/navbar.html | 14 +- pod/main/templates/navbar_collapse.html | 10 +- pod/playlist/apps.py | 2 +- pod/playlist/models.py | 14 +- .../templatetags/playlist_list_modal.py | 1 + pod/playlist/utils.py | 8 +- pod/video/admin.py | 1 + .../management/commands/create_thumbnail.py | 7 +- pod/video/static/css/change_video_owner.css | 146 +---------- pod/video/static/js/change_video_owner.js | 24 +- pod/video/templates/channel/channel_edit.html | 16 +- pod/video/templates/channel/theme_edit.html | 14 +- pod/video/templates/videos/add_video.html | 2 +- .../templates/videos/change_video_owner.html | 176 +++++++------- .../templates/videos/video_collaborate.html | 2 +- pod/video/templates/videos/video_delete.html | 2 +- pod/video/templates/videos/video_edit.html | 17 +- pod/video/tests/test_obsolescence.py | 4 +- pod/video_encode_transcript/Encoding_video.py | 33 +-- .../Encoding_video_model.py | 4 +- pod/video_encode_transcript/encode.py | 30 ++- pod/video_encode_transcript/encoding_tasks.py | 1 + .../importing_tasks.py | 1 + .../importing_transcript_tasks.py | 1 + .../tests/test_encode.py | 42 +++- .../transcripting_tasks.py | 1 + pod/video_encode_transcript/utils.py | 6 +- pod/xapi/apps.py | 1 + pod/xapi/urls.py | 1 + pod/xapi/views.py | 1 + pod/xapi/xapi_tasks.py | 4 +- 68 files changed, 570 insertions(+), 678 deletions(-) create mode 100644 pod/main/templates/main/mandatory_fields.html diff --git a/pod/bbb/templates/bbb/list_meeting.html b/pod/bbb/templates/bbb/list_meeting.html index eed06c22a2..5e60cb96e9 100644 --- a/pod/bbb/templates/bbb/list_meeting.html +++ b/pod/bbb/templates/bbb/list_meeting.html @@ -4,9 +4,6 @@ {% block page_extra_head %} - {% endblock %} {% block breadcrumbs %} @@ -18,8 +15,8 @@

{% trans "Create a video from a BigBlueButton presentation" %}

{% if records.paginator.count == 0 %} -

{% trans "No record found"%}

- +

{% trans "No record found" %}

+ {% else %}

{% blocktrans count counter=records.paginator.count %}{{ counter }} record found{% plural %}{{ counter }} records found{% endblocktrans %}

{% trans "This is the list of the recorded BigBlueButton sessions for which you were moderator. This module allows you to create a video from a BigBlueButton presentation." %}
@@ -61,6 +58,9 @@