diff --git a/app/__init__.py b/app/__init__.py index c08a4cf3a6cbcdfba3c8d223f14b2a58d5a227c0..aa40c14b5ef89925bc0f22a8db40d2aecbcfdae3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -23,6 +23,8 @@ def create_app(config_name): mail.init_app(app) socketio.init_app(app, message_qeue='redis://') + from . import events + from .admin import admin as admin_blueprint app.register_blueprint(admin_blueprint, url_prefix='/admin') diff --git a/app/main/events.py b/app/events.py similarity index 97% rename from app/main/events.py rename to app/events.py index c8ef6259f9aecdd768e500efe6ee83cc7e7f8b02..35474c64d0a08de3f1bea4a9fd1f09ebc3a27b3d 100644 --- a/app/main/events.py +++ b/app/events.py @@ -1,8 +1,8 @@ from flask import current_app, request from flask_login import current_user, login_required -from ..decorators import admin_required -from .. import db, socketio -from ..models import User +from .decorators import admin_required +from . import db, socketio +from .models import User import json import jsonpatch import logging diff --git a/app/main/__init__.py b/app/main/__init__.py index 356af527a684ffa71b5866f139da0bdd76137072..1baeacf6e50e47f921c7182602266cf1701113e1 100644 --- a/app/main/__init__.py +++ b/app/main/__init__.py @@ -3,7 +3,7 @@ from flask import Blueprint main = Blueprint('main', __name__) -from . import errors, events, views +from . import errors, views from ..models import Permission