From a6b01c3c71c939324259675c037805661a38d69f Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Tue, 10 Oct 2017 09:39:00 +0200 Subject: [PATCH] Move RH to indico.web.rh --- importer/indico_importer/controllers.py | 2 +- payment_paypal/indico_payment_paypal/controllers.py | 2 +- previewer_jupyter/indico_previewer_jupyter/controllers.py | 2 +- search/indico_search/controllers.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/importer/indico_importer/controllers.py b/importer/indico_importer/controllers.py index 411b4b7..36eebdb 100644 --- a/importer/indico_importer/controllers.py +++ b/importer/indico_importer/controllers.py @@ -23,9 +23,9 @@ from flask_pluginengine import current_plugin from pytz import timezone, utc from indico.core.db import db -from indico.legacy.webinterface.rh.base import RHProtected from indico.modules.events.timetable.controllers import RHManageTimetableBase from indico.modules.events.timetable.models.entries import TimetableEntry, TimetableEntryType +from indico.web.rh import RHProtected class RHGetImporters(RHProtected): diff --git a/payment_paypal/indico_payment_paypal/controllers.py b/payment_paypal/indico_payment_paypal/controllers.py index 3827121..9ada365 100644 --- a/payment_paypal/indico_payment_paypal/controllers.py +++ b/payment_paypal/indico_payment_paypal/controllers.py @@ -23,12 +23,12 @@ from flask import flash, redirect, request from flask_pluginengine import current_plugin from werkzeug.exceptions import BadRequest -from indico.legacy.webinterface.rh.base import RH from indico.modules.events.payment.models.transactions import TransactionAction from indico.modules.events.payment.notifications import notify_amount_inconsistency from indico.modules.events.payment.util import register_transaction from indico.modules.events.registration.models.registrations import Registration from indico.web.flask.util import url_for +from indico.web.rh import RH from indico_payment_paypal import _ diff --git a/previewer_jupyter/indico_previewer_jupyter/controllers.py b/previewer_jupyter/indico_previewer_jupyter/controllers.py index 7c7fa82..c4f01da 100644 --- a/previewer_jupyter/indico_previewer_jupyter/controllers.py +++ b/previewer_jupyter/indico_previewer_jupyter/controllers.py @@ -22,8 +22,8 @@ from nbconvert.exporters import HTMLExporter from traitlets.config import Config from werkzeug.exceptions import Forbidden -from indico.legacy.webinterface.rh.base import RH from indico.modules.attachments import Attachment +from indico.web.rh import RH from indico_previewer_jupyter.cpp_highlighter import CppHighlighter diff --git a/search/indico_search/controllers.py b/search/indico_search/controllers.py index 5211e40..4dec30b 100644 --- a/search/indico_search/controllers.py +++ b/search/indico_search/controllers.py @@ -21,9 +21,9 @@ from flask_pluginengine import current_plugin from sqlalchemy.orm import undefer from werkzeug.wrappers import Response -from indico.legacy.webinterface.rh.base import RH from indico.modules.categories import Category from indico.modules.events import Event +from indico.web.rh import RH from indico_search.views import WPSearchCategory, WPSearchConference