order videos in channel or theme (#1232)

authored-by: Charneau Franck @fanfounet

pod/locale/fr/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-17 14:28+0000\n"
+"POT-Creation-Date: 2024-11-27 12:02+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: Pod Team [email protected]\n"
@@ -4703,7 +4703,7 @@ msgstr "Obtenir la taille du fichier"
 msgid "Get the file name"
 msgstr "Obtenir le nom du fichier"
 
-#: pod/main/models.py
+#: pod/main/models.py pod/video/models.py
 msgid "order"
 msgstr "ordre"
 
@@ -9128,6 +9128,10 @@ msgstr "Date de l’évènement"
 msgid "The channel where you want your content to appear."
 msgstr "La chaîne où vous voulez que votre contenu apparaisse."
 
+#: pod/video/models.py
+msgid "Order videos in channels or themes."
+msgstr "Ordonner les vidéos dans les chaines ou les thèmes."
+
 #: pod/video/models.py
 msgid "Overview"
 msgstr "Vue d’ensemble"

pod/locale/fr/LC_MESSAGES/djangojs.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Esup-Pod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-17 14:28+0000\n"
+"POT-Creation-Date: 2024-11-27 12:02+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"

pod/locale/nl/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-17 14:28+0000\n"
+"POT-Creation-Date: 2024-11-27 12:02+0100\n"
 "PO-Revision-Date: 2024-07-04 17:54+0200\n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"
@@ -2771,15 +2771,15 @@ msgstr ""
 #: pod/import_video/views.py
 #, python-format
 msgid ""
-"This video “%(name)s” was uploaded to Pod; its origin is %(type)s: <a "
-"href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
+"This video “%(name)s” was uploaded to Pod; its origin is %(type)s: <a href="
+"\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
 msgstr ""
 
 #: pod/import_video/views.py
 #, python-format
 msgid ""
-"This video “%(name)s” was uploaded to Pod; its origin is Youtube: <a "
-"href=\"%(url)s\" target=\"_blank\">%(url)s</a>"
+"This video “%(name)s” was uploaded to Pod; its origin is Youtube: <a href="
+"\"%(url)s\" target=\"_blank\">%(url)s</a>"
 msgstr ""
 
 #: pod/import_video/views.py
@@ -4457,7 +4457,7 @@ msgstr ""
 msgid "Get the file name"
 msgstr ""
 
-#: pod/main/models.py
+#: pod/main/models.py pod/video/models.py
 msgid "order"
 msgstr ""
 
@@ -6145,8 +6145,8 @@ msgstr ""
 msgid ""
 "\n"
 "                <p>Hello,</p>\n"
-"                <p>%(owner)s invites you to the meeting "
-"<strong>%(meeting_title)s</strong>.</p>\n"
+"                <p>%(owner)s invites you to the meeting <strong>"
+"%(meeting_title)s</strong>.</p>\n"
 "                <p>here the link to join the meeting:\n"
 "                <a href=\"%(join_link)s\">%(join_link)s</a></p>\n"
 "                <p>You need this password to enter: <strong>%(password)s</"
@@ -6160,8 +6160,8 @@ msgstr ""
 msgid ""
 "\n"
 "                <p>Hello,</p>\n"
-"                <p>%(owner)s invites you to the meeting "
-"<strong>%(meeting_title)s</strong>.</p>\n"
+"                <p>%(owner)s invites you to the meeting <strong>"
+"%(meeting_title)s</strong>.</p>\n"
 "                <p>Start date: %(start_date_time)s </p>\n"
 "                <p>End date: %(end_date)s </p>\n"
 "                <p>here the link to join the meeting:\n"
@@ -7736,8 +7736,8 @@ msgstr ""
 #: pod/video/templates/videos/video-element.html
 msgid ""
 "To view this video please enable JavaScript, and consider upgrading to a web "
-"browser that <a href=\"https://videojs.com/html5-video-support/\" "
-"target=\"_blank\">supports HTML5 video</a>"
+"browser that <a href=\"https://videojs.com/html5-video-support/\" target="
+"\"_blank\">supports HTML5 video</a>"
 msgstr ""
 
 #: pod/recorder/templates/recorder/link_record.html
@@ -8503,6 +8503,10 @@ msgstr ""
 msgid "The channel where you want your content to appear."
 msgstr ""
 
+#: pod/video/models.py
+msgid "Order videos in channels or themes."
+msgstr ""
+
 #: pod/video/models.py
 msgid "Overview"
 msgstr ""

pod/locale/nl/LC_MESSAGES/djangojs.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Esup-Pod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-17 14:28+0000\n"
+"POT-Creation-Date: 2024-11-27 12:02+0100\n"
 "PO-Revision-Date: 2024-06-04 16:20+0200\n"
 "Last-Translator: obado <[email protected]>\n"
 "Language-Team: \n"

pod/video/forms.py

@@ -688,7 +688,7 @@ class VideoForm(forms.ModelForm):
             {
                 "legend": _("Advanced options"),
                 "classes": "",
-                "fields": ["allow_downloading", "is_360", "disable_comment"],
+                "fields": ["allow_downloading", "is_360", "disable_comment", "order"],
             },
         ),
     )

pod/video/models.py

@@ -833,6 +833,13 @@ class Video(models.Model):
         blank=True,
         null=True,
     )
+    order = models.PositiveSmallIntegerField(
+        _('order'),
+        help_text=_("Order videos in channels or themes."),
+        default=1,
+        blank=True,
+        null=True,
+    )
     thumbnail = models.ForeignKey(
         CustomImageModel,
         on_delete=models.SET_NULL,

pod/video/utils.py

@@ -228,6 +228,7 @@ def sort_videos_list(videos_list: list, sort_field: str, sort_direction: str = "
         "type",
         "viewcount",
         "rank",
+        "order",
     }:
         if sort_field in {"title", "title_fr", "title_en"}:
             sort_field = Lower(sort_field)

pod/video/views.py

@@ -359,6 +359,7 @@ def paginator(videos_list, page):
 def channel(request, slug_c, slug_t=None):
     channel = get_object_or_404(Channel, slug=slug_c, site=get_current_site(request))
     videos_list = get_available_videos().filter(channel=channel)
+    videos_list = sort_videos_list(videos_list, "order", "on")
     channel.video_count = videos_list.count()
 
     theme = None