Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DONE] use bleach in meeting views #809

Merged
merged 9 commits into from
Apr 20, 2023
Merged

[DONE] use bleach in meeting views #809

merged 9 commits into from
Apr 20, 2023

Conversation

thinhantran
Copy link
Contributor

No description provided.

@ptitloup ptitloup marked this pull request as draft April 13, 2023 14:16
@ptitloup ptitloup marked this pull request as ready for review April 13, 2023 14:17
@ptitloup ptitloup self-requested a review April 13, 2023 14:18
ptitloup
ptitloup requested changes Apr 13, 2023
View reviewed changes
Copy link
Contributor

@ptitloup ptitloup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As-tu vérifié les traductions ? Merci

@ptitloup
Copy link
Contributor

peux-tu apporter les mêmes modifications dans les fichiers suivant :
pod/video/utils.py
pod/live/utils.py
pod/recorder/views.py
pod/main/views.py

Merci !

@thinhantran
Copy link
Contributor Author

Bonjour,
J'ai fait mettre a jour les traductions et je modifer 2 file "pod/recorder/views.py" et "pod/video/utils.py". Pour l'instant, je n'ai pas trouvé l'autre endroit qui est possible utiliser "bleach".
Est-ce qu'il y a l'autre problème ?

Badatos
Badatos reviewed Apr 14, 2023
View reviewed changes
.env.dev-exemple Outdated
@@ -1,7 +0,0 @@
DJANGO_SUPERUSER_USERNAME=<USER>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pourquoi retirer ce fichier ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je remplace le fichier ".env.dev-exemple" par le fichier ".env.dev"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Il faut remettre ce fichier

@ptitloup ptitloup changed the base branch from master to develop April 17, 2023 07:36
@ptitloup ptitloup changed the title use bleach in meeting views [DONE] use bleach in meeting views Apr 17, 2023
ptitloup
ptitloup requested changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@ptitloup ptitloup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

il faut remettre le fichiuer manquant et tester si les courriels envoyés sont ok

.env.dev-exemple Outdated
@@ -1,7 +0,0 @@
DJANGO_SUPERUSER_USERNAME=<USER>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Il faut remettre ce fichier

pod/locale/fr/LC_MESSAGES/django.po Outdated
@@ -7727,3 +7652,72 @@ msgstr "Désolé, la recherche de vidéos est limitée à 500 pages maximum."
#: pod/video_search/views.py:262
msgid "Search results"
msgstr "Résultats de la recherche"

#~ msgid ""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

si ce code n'est plus utilisé, il faut le retirer

@thinhantran
Copy link
Contributor Author

thinhantran commented Apr 17, 2023 •
edited
Loading

je remets le fichier manqueet et remove le code qui n'utilise pas. Je teste les courriels envoyés qui sont bien.

@Badatos
Copy link
Collaborator

Badatos commented Apr 17, 2023 •
edited
Loading

Merci pour les corrections.

Dans le fichier pod/main/views.py, il y a cette ligne (246) text_content = loader.get_template("mail/mail.txt") ce serait bien aussi d'utiliser bleach non ?

Idem ligne 57 du fichier pod/live/utils.py

ptitloup
ptitloup reviewed Apr 17, 2023
View reviewed changes
Copy link
Contributor

@ptitloup ptitloup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

testé sur l'encodage et l'invitation par mail pour une reunion. Tout est ok

@thinhantran
Copy link
Contributor Author

j'utilise "bleach" dans 2 file "pod/main/views.py" et "pod/live/utils.py".

Badatos
Badatos reviewed Apr 19, 2023
View reviewed changes
pod/main/views.py Outdated Show resolved Hide resolved
Badatos
Badatos reviewed Apr 19, 2023
View reviewed changes
pod/video/utils.py Outdated Show resolved Hide resolved
@thinhantran
Copy link
Contributor Author

je modifies mes problème

AymericJak
AymericJak reviewed Apr 20, 2023
View reviewed changes
pod/main/views.py Show resolved Hide resolved
pod/main/views.py Show resolved Hide resolved
ptitloup
ptitloup approved these changes Apr 20, 2023
View reviewed changes
Copy link
Contributor

@ptitloup ptitloup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok pour moi mais merci de regler les conflits pour que je puisse tester les modifications

@ptitloup
Copy link
Contributor

test du signalement d'une video ok

@ptitloup
Copy link
Contributor

test fin de transcription ok

@ptitloup ptitloup merged commit 5388dee into EsupPortail:develop Apr 20, 2023
vsabatie pushed a commit to vsabatie/Pod that referenced this pull request May 2, 2023
@thinhantran @TranNhan99 @vsabatie
[DONE] use bleach in meeting views (EsupPortail#809)
3886e0f 
* use bleach in meeting views

* use bleach on video and recorder

* use bleach in main and live

* use bleach in main

---------

Co-authored-by: tnhan <trannhan2589@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ptitloup ptitloup ptitloup approved these changes

@Badatos Badatos Badatos approved these changes

@AymericJak AymericJak AymericJak approved these changes

Assignees

@thinhantran thinhantran

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thinhantran @ptitloup @Badatos @AymericJak @TranNhan99