diff --git a/app/admin/forms.py b/app/admin/forms.py index ea46a55388e827575f316389d2678bb151bbe3c7..0bd755dca513b5f106fc9fc785a5ec424e338f3a 100644 --- a/app/admin/forms.py +++ b/app/admin/forms.py @@ -1,8 +1,8 @@ +from app.models import Role, User from flask_wtf import FlaskForm from wtforms import (BooleanField, SelectField, StringField, SubmitField, ValidationError) from wtforms.validators import DataRequired, Email, Length, Regexp -from ..models import Role, User class EditProfileAdminForm(FlaskForm): diff --git a/app/admin/views.py b/app/admin/views.py index 3f992087155c379a291b1cc2d72b3d7f201716e1..0cbdf6ff4776e74042ed704c7a980c9e4cc60b15 100644 --- a/app/admin/views.py +++ b/app/admin/views.py @@ -1,12 +1,12 @@ +from app import db +from app.decorators import admin_required +from app.models import Role, User +from app.tables import AdminUserItem, AdminUserTable from app.utils import background_delete_user from flask import current_app, flash, redirect, render_template, url_for from flask_login import login_required from . import admin from .forms import EditProfileAdminForm -from .. import db -from ..decorators import admin_required -from ..models import Role, User -from ..tables import AdminUserTable, AdminUserItem import threading diff --git a/app/auth/forms.py b/app/auth/forms.py index 296ce811d4179f9ced28db0f097759dd3a815c31..2f03f1b14b7b76c2544feb24f4a91c14ec4046b6 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -1,8 +1,8 @@ +from app.models import User from flask_wtf import FlaskForm from wtforms import (BooleanField, PasswordField, StringField, SubmitField, ValidationError) from wtforms.validators import DataRequired, Email, EqualTo, Length, Regexp -from ..models import User class LoginForm(FlaskForm): diff --git a/app/auth/views.py b/app/auth/views.py index 0ef0b4283c341921d8a3bca50ff044c7b40f4970..0b124a82c95f6142e3f8db087348f42e9f3fe1c2 100644 --- a/app/auth/views.py +++ b/app/auth/views.py @@ -1,11 +1,11 @@ +from app import db +from app.email import send_email +from app.models import User from flask import flash, redirect, render_template, request, url_for from flask_login import current_user, login_required, login_user, logout_user from . import auth from .forms import (LoginForm, PasswordResetForm, PasswordResetRequestForm, RegistrationForm) -from .. import db -from ..email import send_email -from ..models import User @auth.route('/login', methods=['GET', 'POST']) diff --git a/app/corpora/views.py b/app/corpora/views.py index 20c18e5fd0ba043f4ff4ab92ffb289db4e977ab5..9f95fbbcffeae801cdef1585323fade3635f48ce 100644 --- a/app/corpora/views.py +++ b/app/corpora/views.py @@ -1,13 +1,13 @@ +from app import db +from app.models import Corpus, CorpusFile from app.utils import background_prepare_corpus_file from flask import (abort, current_app, flash, redirect, request, render_template, url_for, send_from_directory) from flask_login import current_user, login_required +from werkzeug.utils import secure_filename from . import corpora from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm, QueryDownloadForm, QueryForm) -from .. import db -from ..models import Corpus, CorpusFile -from werkzeug.utils import secure_filename import os import threading import logging