diff --git a/web/b3desk/templates/meeting/signin_links.html b/web/b3desk/templates/meeting/signin_links.html index 07a8034..afd26f9 100644 --- a/web/b3desk/templates/meeting/signin_links.html +++ b/web/b3desk/templates/meeting/signin_links.html @@ -1,9 +1,5 @@ -{{ moderator_message }} +{{ moderator_message }}
-{{ moderator_link_introduction }} : +{{ moderator_link_introduction }} : {{ moderator_signin_url }}
-{{ moderator_signin_url }} - -{{ attendee_link_introduction }} : - -{{ attendee_signin_url }} +{{ attendee_link_introduction }} : {{ attendee_signin_url }} diff --git a/web/tests/meeting/test_meeting.py b/web/tests/meeting/test_meeting.py index 2e22d04..1d4750d 100644 --- a/web/tests/meeting/test_meeting.py +++ b/web/tests/meeting/test_meeting.py @@ -299,7 +299,7 @@ def test_create_no_file(client_app, meeting, mocker, bbb_response): "logoutURL": "https://log.out", "record": "true", "duration": "60", - "moderatorOnlyMessage": f"Welcome moderators!\n\n Lien Modérateur :\n\nhttp://localhost:5000/meeting/signin/moderateur/1/creator/1/hash/{meeting.get_hash(Role.moderator)}\n\n Lien Participant :\n\nhttp://localhost:5000/meeting/signin/invite/1/creator/1/hash/{meeting.get_hash(Role.attendee)}", + "moderatorOnlyMessage": f'Welcome moderators!
\n\n Lien Modérateur  : http://localhost:5000/meeting/signin/moderateur/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.moderator)}
\n\n Lien Participant  : http://localhost:5000/meeting/signin/invite/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.attendee)}', "autoStartRecording": "false", "allowStartStopRecording": "true", "webcamsOnlyForModerator": "false", @@ -393,7 +393,7 @@ def test_create_with_only_a_default_file( "logoutURL": "https://log.out", "record": "true", "duration": "60", - "moderatorOnlyMessage": f"Welcome moderators!\n\n Lien Modérateur :\n\nhttp://localhost:5000/meeting/signin/moderateur/1/creator/1/hash/{meeting.get_hash(Role.moderator)}\n\n Lien Participant :\n\nhttp://localhost:5000/meeting/signin/invite/1/creator/1/hash/{meeting.get_hash(Role.attendee)}", + "moderatorOnlyMessage": f'Welcome moderators!
\n\n Lien Modérateur  : http://localhost:5000/meeting/signin/moderateur/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.moderator)}
\n\n Lien Participant  : http://localhost:5000/meeting/signin/invite/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.attendee)}', "autoStartRecording": "false", "allowStartStopRecording": "true", "webcamsOnlyForModerator": "false", @@ -486,7 +486,7 @@ def test_create_with_files( "logoutURL": "https://log.out", "record": "true", "duration": "60", - "moderatorOnlyMessage": f"Welcome moderators!\n\n Lien Modérateur :\n\nhttp://localhost:5000/meeting/signin/moderateur/1/creator/1/hash/{meeting.get_hash(Role.moderator)}\n\n Lien Participant :\n\nhttp://localhost:5000/meeting/signin/invite/1/creator/1/hash/{meeting.get_hash(Role.attendee)}", + "moderatorOnlyMessage": f'Welcome moderators!
\n\n Lien Modérateur  : http://localhost:5000/meeting/signin/moderateur/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.moderator)}
\n\n Lien Participant  : http://localhost:5000/meeting/signin/invite/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.attendee)}', "autoStartRecording": "false", "allowStartStopRecording": "true", "webcamsOnlyForModerator": "false", @@ -567,7 +567,7 @@ def test_create_quick_meeting(client_app, monkeypatch, user, mocker, bbb_respons "meetingKeepEvents": "true", "meta_analytics-callback-url": "https://bbb-analytics-staging.osc-fr1.scalingo.io/v1/post_events", "meta_academy": "domain.tld", - "moderatorOnlyMessage": f"Bienvenue aux modérateurs. Pour inviter quelqu'un à ce séminaire, envoyez-lui l'un de ces liens :\n\n Lien Modérateur :\n\nhttp://localhost:5000/meeting/signin/moderateur/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.moderator)}\n\n Lien Participant :\n\nhttp://localhost:5000/meeting/signin/invite/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.attendee)}", + "moderatorOnlyMessage": f'Bienvenue aux modérateurs. Pour inviter quelqu\'un à ce séminaire, envoyez-lui l\'un de ces liens :
\n\n Lien Modérateur  : http://localhost:5000/meeting/signin/moderateur/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.moderator)}
\n\n Lien Participant  : http://localhost:5000/meeting/signin/invite/{meeting.fake_id}/creator/1/hash/{meeting.get_hash(Role.attendee)}', "guestPolicy": "ALWAYS_ACCEPT", "checksum": mock.ANY, }