From 63213dc04f1437f0115e30bc72c9bb94d56263ea Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Fri, 29 Jan 2021 18:39:20 +0100 Subject: [PATCH] Adapt to confId -> event_id change See indico/indico#4676 --- payment_paypal/indico_payment_paypal/blueprint.py | 6 ++++-- payment_paypal/tests/controllers_test.py | 2 +- piwik/indico_piwik/client/index.js | 2 +- piwik/indico_piwik/plugin.py | 8 +++----- piwik/indico_piwik/templates/statistics.html | 2 +- ursh/indico_ursh/blueprint.py | 2 +- vc_vidyo/indico_vc_vidyo/blueprint.py | 8 ++++++-- vc_zoom/indico_vc_zoom/blueprint.py | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/payment_paypal/indico_payment_paypal/blueprint.py b/payment_paypal/indico_payment_paypal/blueprint.py index 35dd9c9..3f8f3f2 100644 --- a/payment_paypal/indico_payment_paypal/blueprint.py +++ b/payment_paypal/indico_payment_paypal/blueprint.py @@ -10,8 +10,10 @@ from indico.core.plugins import IndicoPluginBlueprint from indico_payment_paypal.controllers import RHPaypalCancel, RHPaypalIPN, RHPaypalSuccess -blueprint = IndicoPluginBlueprint('payment_paypal', __name__, - url_prefix='/event//registrations//payment/response/paypal') +blueprint = IndicoPluginBlueprint( + 'payment_paypal', __name__, + url_prefix='/event//registrations//payment/response/paypal' +) blueprint.add_url_rule('/cancel', 'cancel', RHPaypalCancel, methods=('GET', 'POST')) blueprint.add_url_rule('/success', 'success', RHPaypalSuccess, methods=('GET', 'POST')) diff --git a/payment_paypal/tests/controllers_test.py b/payment_paypal/tests/controllers_test.py index fc57d3b..d011825 100644 --- a/payment_paypal/tests/controllers_test.py +++ b/payment_paypal/tests/controllers_test.py @@ -94,7 +94,7 @@ def test_ipn_process(mocker, fail): rh.registration.getTotal.return_value = 10.00 payment_status = {'fail': 'Failed', 'refund': 'Refunded', 'status': 'Foobar'}.get(fail, 'Completed') amount = '-10.00' if fail == 'negative' else '10.00' - request.view_args = {'confId': rh.event.id} + request.view_args = {'event_id': rh.event.id} request.args = {'registrantId': '1'} request.form = {'payment_status': payment_status, 'txn_id': '12345', 'mc_gross': amount, 'mc_currency': 'EUR', 'business': 'foo@bar.com'} diff --git a/piwik/indico_piwik/client/index.js b/piwik/indico_piwik/client/index.js index 7f53b04..ae4b6fd 100644 --- a/piwik/indico_piwik/client/index.js +++ b/piwik/indico_piwik/client/index.js @@ -100,7 +100,7 @@ $(function() { */ const get_api_params = function() { const params = { - confId: $('#confId').val(), + event_id: $('#eventId').val(), start_date: $('#statsFilterStartDate').val(), end_date: $('#statsFilterEndDate').val(), }; diff --git a/piwik/indico_piwik/plugin.py b/piwik/indico_piwik/plugin.py index 460e268..ca3aa2a 100644 --- a/piwik/indico_piwik/plugin.py +++ b/piwik/indico_piwik/plugin.py @@ -95,10 +95,8 @@ class PiwikPlugin(IndicoPlugin): if not self.settings.get('enabled_for_events') or not site_id_events: return {} params = {'site_id_events': site_id_events} - if request.blueprint in ('event', 'events', 'contributions') and 'confId' in request.view_args: - if not str(request.view_args['confId']).isdigit(): - return {} - params['event_id'] = request.view_args['confId'] + if request.blueprint in ('event', 'events', 'contributions') and 'event_id' in request.view_args: + params['event_id'] = request.view_args['event_id'] contrib_id = request.view_args.get('contrib_id') if contrib_id is not None and str(contrib_id).isdigit(): contribution = Contribution.query.filter_by(event_id=params['event_id'], id=contrib_id).first() @@ -115,7 +113,7 @@ class PiwikPlugin(IndicoPlugin): return url.netloc + url.path -blueprint = IndicoPluginBlueprint('piwik', __name__, url_prefix='/event//manage/statistics') +blueprint = IndicoPluginBlueprint('piwik', __name__, url_prefix='/event//manage/statistics') blueprint.add_url_rule('/', 'view', RHStatistics) blueprint.add_url_rule('/material', 'material', RHApiMaterial, methods=('GET', 'POST')) blueprint.add_url_rule('/data/downloads', 'data_downloads', RHApiDownloads, methods=('GET', 'POST')) diff --git a/piwik/indico_piwik/templates/statistics.html b/piwik/indico_piwik/templates/statistics.html index 1103400..a0315d8 100644 --- a/piwik/indico_piwik/templates/statistics.html +++ b/piwik/indico_piwik/templates/statistics.html @@ -31,7 +31,7 @@ id="statsFilterEndDate" data-default="{{ report.end_date }}" value="{{ report.end_date }}"> - +
diff --git a/ursh/indico_ursh/blueprint.py b/ursh/indico_ursh/blueprint.py index 869bdcc..68a02df 100644 --- a/ursh/indico_ursh/blueprint.py +++ b/ursh/indico_ursh/blueprint.py @@ -13,5 +13,5 @@ from indico_ursh.controllers import RHCustomShortURLPage, RHGetShortURL, RHShort blueprint = IndicoPluginBlueprint('ursh', 'indico_ursh') blueprint.add_url_rule('/ursh', 'get_short_url', RHGetShortURL, methods=('POST',)) blueprint.add_url_rule('/url-shortener', 'shorten_url', RHShortURLPage) -blueprint.add_url_rule('/event//manage/short-url', 'shorten_event_url', RHCustomShortURLPage, +blueprint.add_url_rule('/event//manage/short-url', 'shorten_event_url', RHCustomShortURLPage, methods=('GET', 'POST')) diff --git a/vc_vidyo/indico_vc_vidyo/blueprint.py b/vc_vidyo/indico_vc_vidyo/blueprint.py index fb4c2d2..73dc46b 100644 --- a/vc_vidyo/indico_vc_vidyo/blueprint.py +++ b/vc_vidyo/indico_vc_vidyo/blueprint.py @@ -15,5 +15,9 @@ blueprint = IndicoPluginBlueprint('vc_vidyo', 'indico_vc_vidyo') # Room management # using any(vidyo) instead of defaults since the event vc room locator # includes the service and normalization skips values provided in 'defaults' -blueprint.add_url_rule('/event//manage/videoconference///room-owner', - 'set_room_owner', RHVidyoRoomOwner, methods=('POST',)) +blueprint.add_url_rule( + '/event//manage/videoconference///room-owner', + 'set_room_owner', + RHVidyoRoomOwner, + methods=('POST',) +) diff --git a/vc_zoom/indico_vc_zoom/blueprint.py b/vc_zoom/indico_vc_zoom/blueprint.py index 38ed0ff..ab56ea0 100644 --- a/vc_zoom/indico_vc_zoom/blueprint.py +++ b/vc_zoom/indico_vc_zoom/blueprint.py @@ -16,7 +16,7 @@ blueprint = IndicoPluginBlueprint('vc_zoom', 'indico_vc_zoom') # using any(zoom) instead of defaults since the event vc room locator # includes the service and normalization skips values provided in 'defaults' blueprint.add_url_rule( - '/event//manage/videoconference///make-me-alt-host', + '/event//manage/videoconference///make-me-alt-host', 'make_me_alt_host', RHRoomAlternativeHost, methods=('POST',)