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/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/indico_vc_zoom/plugin.py b/vc_zoom/indico_vc_zoom/plugin.py index 70c558c..7398b9e 100644 --- a/vc_zoom/indico_vc_zoom/plugin.py +++ b/vc_zoom/indico_vc_zoom/plugin.py @@ -17,7 +17,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 @@ -158,7 +158,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): 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