[DONE] More 3.5.x fixes #1043

Badatos · 2024-02-01T16:49:58Z

Remove everey useless "card-group" class as there is never several cards grouped with it
Code formatting (remove useless spaces & indent)
Add z-index to .card-footer-pod to prevent from hide by thumbnail below
Add missing globals in some js files
Video stats view highlights : color the th linked to the clicked stat from the video
Now contrib.role is properly translated in video-info
Remove the more_style block (redundant with page_extra_head)
Replace some specific breadcrumb by generic {{page_title}} var
Polish some templates (directs, directs_all, playlists
Shrink vjs toolbar on very small screens (<=400px width)
JS : test presence of favorite-btn-link

…cards grouped with it * Code formatting (remove useless spaces & indent) * Add z-index to .card-footer-pod to prevent from hide by thumbnail below * Add missing globals in some js files * Video stats view highlights : color the th linked to the clicked stat from the video * Now contrib.role is properly translated in video-info

* Replace some specific breadcrumb by generic {{page_title}} var * Polish some templates (directs, directs_all, playlists * Shrink vjs toolbar on very small screens (<=400pw width) * JS : test presence of favorite-btn-link

pod/bbb/templates/bbb/live_list_meeting.html

pod/bbb/views.py

pod/completion/admin.py

pod/import_video/templates/import_video/add_or_edit.html

pod/video/models.py

pod/video/static/js/video_stats_view.js

pod/video/templates/videos/footer_link.html

pod/video/templates/videos/video-info.html

pod/video/views.py

pod/live/templates/live/event_immediate_edit.html

pod/live/templates/live/events.html

pod/locale/fr/LC_MESSAGES/django.po

pod/meeting/templates/meeting/add_or_edit.html

pod/video/static/js/video_stats_view.js

pod/video/templates/videos/dashboard.html

pod/video/templates/videos/video-info.html

Badatos · 2024-02-05T16:13:03Z

Merci @AymericJak & @SebastienCozeDev !
Branche à jour, avec vos propositions incluses ^^

AymericJak · 2024-02-06T08:30:53Z

pod/video/static/js/ajax-display-channels.js

-                        <span class="spinner-border text-primary" role="status">
-                        </span>
+                        <i class="bi bi-play-btn" aria-hidden="true"></i>&nbsp;<span
+                           class="spinner-border text-primary" role="status"> </span>


Pourquoi un espace comme ça dans la span ?

Une utilité ? Ou on pourrait mettre  

C'est juste pour être certain de ne pas altérer le comportement précédent, comme ce n'est pas mon script, vu qu'il y avait des espace j'en ai laissé un ^^.

AymericJak · 2024-02-06T08:31:00Z

pod/video/static/js/ajax-display-channels.js

                    </h2>
                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${gettext(
                      "Close",
                    )}"></button>
                </div>
            <div class="modal-body">
                <div class="text-center">
-                    <span class="spinner-border text-primary" role="status">
-                    </span>
+                    <span class="spinner-border text-primary" role="status"> </span>


AymericJak · 2024-02-06T08:46:02Z

pod/video/views.py

@@ -870,7 +870,8 @@ def get_filtered_videos_list(request, videos_list):
    return videos_list.distinct()


-def get_owners_has_instances(owners):
+def get_owners_has_instances(owners: list) -> list:


On peut même spécifier ce que contient la liste : -> list[Owner]

Le souci c'est que la classe Owner n'est pas dans ce script, et ca m'embête de l'importer juste pour un doctype :/

SebastienCozeDev · 2024-02-06T09:16:14Z

pod/video/models.py

    def set_password(self):
-        """Encrypt the password if video is protected. An encrypted password cannot be re-encrypted."""
+        """
+        Encrypt the password if video is protected.
+
+         An encrypted password cannot be re-encrypted.
+        """


Mettre None serait une bonne idée ^^

SebastienCozeDev · 2024-02-06T09:19:40Z

pod/video/views.py

@@ -870,7 +870,8 @@ def get_filtered_videos_list(request, videos_list):
    return videos_list.distinct()


-def get_owners_has_instances(owners):
+def get_owners_has_instances(owners: list) -> list:


Il serait peut-être préférable de mettre le type list[Owner]

@SInCE

* add @SInCE in som js scripts

AymericJak

C'est bon pour moi !!

Merci beaucoup pour cette myriade de fix 😁

AymericJak · 2024-02-06T10:27:46Z

Par contre, pourquoi les tests ne passent plus ?

AymericJak · 2024-02-06T10:28:54Z

  File "/opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/django/template/loader_tags.py", line 212, in do_block
    raise TemplateSyntaxError("'%s' tag with name '%s' appears more than once" % (bits[0], block_name))
django.template.exceptions.TemplateSyntaxError: 'block' tag with name 'page_content' appears more than once

* now test translated strings * one of test users is now staff

Badatos · 2024-02-06T10:56:56Z

C'est bon les tests repassent ;)
Apparament ca venait du fait que les tests sur les imports de vidéos étaient faits sur les chaines non traduites.
Avec les chaines traduites ca passe ;)

J'en ai profité pour corriger le test sur RESTRICT_EDIT_IMPORT_VIDEO_ACCESS_TO_STAFF_ONLY : il était envoyé au template sans être utilisé. Maintenant la page affiche bien que l'acces est restreint.

SebastienCozeDev

Parfait pour moi

Badatos self-assigned this Feb 1, 2024

* Remove the more_style block (redundant with page_extra_head)

d35b019

* Replace some specific breadcrumb by generic {{page_title}} var * Polish some templates (directs, directs_all, playlists * Shrink vjs toolbar on very small screens (<=400pw width) * JS : test presence of favorite-btn-link

Badatos changed the title ~~[WIP] More 3.5.x fixes~~ [DONE] More 3.5.x fixes Feb 2, 2024

Badatos marked this pull request as ready for review February 2, 2024 16:05

Badatos added 2 commits February 2, 2024 17:14

Update i18n .po/mo files

2e0d90d

corect heading

20c7811

AymericJak self-requested a review February 5, 2024 09:22

AymericJak added the bug Something isn't working label Feb 5, 2024

AymericJak requested changes Feb 5, 2024

View reviewed changes

SebastienCozeDev requested changes Feb 5, 2024

View reviewed changes

Badatos added 2 commits February 5, 2024 16:53

Changes asked by @AymericJak & @SebastienCozeDev

be92bbe

Update i18n .po/mo files

45d9352

AymericJak reviewed Feb 6, 2024

View reviewed changes

SebastienCozeDev requested changes Feb 6, 2024

View reviewed changes

* do not display import videos when access_not_allowed

4ef71c5

* add @SInCE in som js scripts

AymericJak approved these changes Feb 6, 2024

View reviewed changes

Badatos added 2 commits February 6, 2024 11:49

import_video tests :

5e205d4

* now test translated strings * one of test users is now staff

Merge branch 'develop' into feature/More_3.5.X_fixes

b8c00a5

correct tag in import_video

e85bb30

SebastienCozeDev approved these changes Feb 6, 2024

View reviewed changes

ptitloup merged commit d1a3fcc into EsupPortail:develop Feb 6, 2024
5 checks passed

Badatos deleted the feature/More_3.5.X_fixes branch February 9, 2024 09:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DONE] More 3.5.x fixes #1043

[DONE] More 3.5.x fixes #1043

Badatos commented Feb 1, 2024 •

edited

Badatos commented Feb 5, 2024

AymericJak Feb 6, 2024

Badatos Feb 6, 2024

AymericJak Feb 6, 2024

AymericJak Feb 6, 2024

Badatos Feb 6, 2024

SebastienCozeDev Feb 6, 2024

SebastienCozeDev Feb 6, 2024

AymericJak left a comment

AymericJak commented Feb 6, 2024

AymericJak commented Feb 6, 2024

Badatos commented Feb 6, 2024 •

edited

SebastienCozeDev left a comment

[DONE] More 3.5.x fixes #1043

[DONE] More 3.5.x fixes #1043

Conversation

Badatos commented Feb 1, 2024 • edited

Badatos commented Feb 5, 2024

AymericJak Feb 6, 2024

Choose a reason for hiding this comment

Badatos Feb 6, 2024

Choose a reason for hiding this comment

AymericJak Feb 6, 2024

Choose a reason for hiding this comment

AymericJak Feb 6, 2024

Choose a reason for hiding this comment

Badatos Feb 6, 2024

Choose a reason for hiding this comment

SebastienCozeDev Feb 6, 2024

Choose a reason for hiding this comment

SebastienCozeDev Feb 6, 2024

Choose a reason for hiding this comment

AymericJak left a comment

Choose a reason for hiding this comment

AymericJak commented Feb 6, 2024

AymericJak commented Feb 6, 2024

Badatos commented Feb 6, 2024 • edited

SebastienCozeDev left a comment

Choose a reason for hiding this comment

Badatos commented Feb 1, 2024 •

edited

Badatos commented Feb 6, 2024 •

edited