diff --git a/piwik/indico_piwik/controllers.py b/piwik/indico_piwik/controllers.py index 8b65f6d..5810304 100644 --- a/piwik/indico_piwik/controllers.py +++ b/piwik/indico_piwik/controllers.py @@ -16,7 +16,7 @@ from flask import jsonify -from indico.core.config import Config +from indico.core.config import config from indico.modules.events.management.controllers import RHManageEventBase from indico_piwik.reports import (ReportCountries, ReportDevices, ReportDownloads, ReportGeneral, ReportMaterial, @@ -28,7 +28,7 @@ class RHStatistics(RHManageEventBase): def _checkParams(self, params): RHManageEventBase._checkParams(self, params) self._params = params - self._params['loading_gif'] = '{}/images/loading.gif'.format(Config.getInstance().getBaseURL()) + self._params['loading_gif'] = '{}/images/loading.gif'.format(config.BASE_URL) self._params['report'] = ReportGeneral.get(event_id=params.get('confId'), contrib_id=params.get('contrib_id'), start_date=params.get('start_date'), end_date=params.get('end_date')) diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py index 04f2982..91edbcf 100644 --- a/vc_vidyo/indico_vc_vidyo/plugin.py +++ b/vc_vidyo/indico_vc_vidyo/plugin.py @@ -25,7 +25,7 @@ from wtforms.validators import DataRequired, NumberRange from indico.core import signals from indico.core.auth import multipass -from indico.core.config import Config +from indico.core.config import config from indico.core.plugins import IndicoPlugin, url_for_plugin from indico.modules.events.views import WPSimpleEventDisplay from indico.modules.vc import VCPluginMixin, VCPluginSettingsFormBase @@ -95,7 +95,7 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin): @property def default_settings(self): return dict(VCPluginMixin.default_settings, **{ - 'support_email': Config.getInstance().getSupportEmail(), + 'support_email': config.SUPPORT_EMAIL, 'username': 'indico', 'password': None, 'admin_api_wsdl': 'https://yourvidyoportal/services/v1_1/VidyoPortalAdminService?wsdl',