From 8f36f1d87e50416a0a7e4224d431e4a76daf746b Mon Sep 17 00:00:00 2001 From: Javier Ferrer Date: Thu, 4 Nov 2021 16:59:05 +0100 Subject: [PATCH 1/3] VC/Zoom: Change bundle injection to subclass --- vc_zoom/indico_vc_zoom/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vc_zoom/indico_vc_zoom/plugin.py b/vc_zoom/indico_vc_zoom/plugin.py index b49283e..2395013 100644 --- a/vc_zoom/indico_vc_zoom/plugin.py +++ b/vc_zoom/indico_vc_zoom/plugin.py @@ -19,7 +19,7 @@ from indico.core import signals from indico.core.auth import multipass from indico.core.errors import UserValueError from indico.core.plugins import IndicoPlugin, render_plugin_template, url_for_plugin -from indico.modules.events.views import WPConferenceDisplayBase, WPSimpleEventDisplay +from indico.modules.events.views import WPConferenceDisplay, WPSimpleEventDisplay from indico.modules.vc import VCPluginMixin, VCPluginSettingsFormBase from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomStatus @@ -160,7 +160,7 @@ class ZoomPlugin(VCPluginMixin, IndicoPlugin): self.inject_bundle('main.js', WPSimpleEventDisplay) self.inject_bundle('main.js', WPVCEventPage) self.inject_bundle('main.js', WPVCManageEvent) - self.inject_bundle('main.js', WPConferenceDisplayBase) + self.inject_bundle('main.js', WPConferenceDisplay) @property def logo_url(self): From 3b401bc195787b86acd8be6194385999fa9c13ea Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Tue, 16 Nov 2021 12:30:11 +0100 Subject: [PATCH 2/3] VC/Zoom: Bump version to 3.0.2 The JS error was most likely caused by the plugin having been built against 3.1 instead of 3.0... --- vc_zoom/README.md | 5 +++++ vc_zoom/setup.cfg | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vc_zoom/README.md b/vc_zoom/README.md index 44162e7..e3f6782 100644 --- a/vc_zoom/README.md +++ b/vc_zoom/README.md @@ -11,6 +11,11 @@ ## Changelog +### 3.0.2 + +- Fix JavaScript being included twice on conference VC page +- Fix JavaScript error breaking the "make me co-host" button + ### 3.0.1 - Adapt to Indico 3.0.3 changes (option to show videoconference link on the main conference page) diff --git a/vc_zoom/setup.cfg b/vc_zoom/setup.cfg index be6c170..23b4803 100644 --- a/vc_zoom/setup.cfg +++ b/vc_zoom/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = indico-plugin-vc-zoom -version = 3.0.1 +version = 3.0.2 description = Zoom video-conferencing plugin for Indico long_description = file: README.md long_description_content_type = text/markdown; charset=UTF-8; variant=GFM From 742d5acd262ef94ea559dc3b0421e26f02922b9a Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Tue, 16 Nov 2021 12:49:35 +0100 Subject: [PATCH 3/3] Fix DeprecationWarning breaking tests Celery is using an invalid legacy version specifier (celery/celery#7074) --- citadel/pytest.ini | 2 ++ livesync/pytest.ini | 2 ++ payment_paypal/pytest.ini | 2 ++ storage_s3/pytest.ini | 2 ++ vc_zoom/pytest.ini | 2 ++ 5 files changed, 10 insertions(+) diff --git a/citadel/pytest.ini b/citadel/pytest.ini index 13a6553..378e457 100644 --- a/citadel/pytest.ini +++ b/citadel/pytest.ini @@ -12,5 +12,7 @@ filterwarnings = ignore::UserWarning # port_for via pytest-redis ignore:Sampling from a set deprecated:DeprecationWarning:port_for + # celery + ignore:Creating a LegacyVersion has been deprecated:DeprecationWarning ; use redis-server from $PATH redis_exec = redis-server diff --git a/livesync/pytest.ini b/livesync/pytest.ini index 85a4aed..53f9b8f 100644 --- a/livesync/pytest.ini +++ b/livesync/pytest.ini @@ -12,5 +12,7 @@ filterwarnings = ignore::UserWarning # port_for via pytest-redis ignore:Sampling from a set deprecated:DeprecationWarning:port_for + # celery + ignore:Creating a LegacyVersion has been deprecated:DeprecationWarning ; use redis-server from $PATH redis_exec = redis-server diff --git a/payment_paypal/pytest.ini b/payment_paypal/pytest.ini index 89fa33c..4a02202 100644 --- a/payment_paypal/pytest.ini +++ b/payment_paypal/pytest.ini @@ -12,5 +12,7 @@ filterwarnings = ignore::UserWarning # port_for via pytest-redis ignore:Sampling from a set deprecated:DeprecationWarning:port_for + # celery + ignore:Creating a LegacyVersion has been deprecated:DeprecationWarning ; use redis-server from $PATH redis_exec = redis-server diff --git a/storage_s3/pytest.ini b/storage_s3/pytest.ini index 7990c25..56a5502 100644 --- a/storage_s3/pytest.ini +++ b/storage_s3/pytest.ini @@ -12,5 +12,7 @@ filterwarnings = ignore::UserWarning # port_for via pytest-redis ignore:Sampling from a set deprecated:DeprecationWarning:port_for + # celery + ignore:Creating a LegacyVersion has been deprecated:DeprecationWarning ; use redis-server from $PATH redis_exec = redis-server diff --git a/vc_zoom/pytest.ini b/vc_zoom/pytest.ini index 76d670e..4b7dcbe 100644 --- a/vc_zoom/pytest.ini +++ b/vc_zoom/pytest.ini @@ -12,5 +12,7 @@ filterwarnings = ignore::UserWarning # port_for via pytest-redis ignore:Sampling from a set deprecated:DeprecationWarning:port_for + # celery + ignore:Creating a LegacyVersion has been deprecated:DeprecationWarning ; use redis-server from $PATH redis_exec = redis-server