Skip to content
Snippets Groups Projects
Commit 107bba8d authored by Benjamin Bertrand's avatar Benjamin Bertrand
Browse files

Cleaning

Don't override the Admin view __init__ method for consistency.
Avoid having to import models in admin/views.py
parent 3a1e1ad8
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ from wtforms import validators, fields ...@@ -13,7 +13,7 @@ from wtforms import validators, fields
from flask_admin.contrib import sqla from flask_admin.contrib import sqla
from flask_admin.model.form import converts from flask_admin.model.form import converts
from flask_login import current_user from flask_login import current_user
from ..models import Item, User, Group, ICS_ID_RE from ..models import ICS_ID_RE
# Add custom model converter for CIText type # Add custom model converter for CIText type
...@@ -37,18 +37,12 @@ class GroupAdmin(AdminModelView): ...@@ -37,18 +37,12 @@ class GroupAdmin(AdminModelView):
can_edit = False can_edit = False
can_delete = False can_delete = False
def __init__(self, session):
super().__init__(Group, session)
class UserAdmin(AdminModelView): class UserAdmin(AdminModelView):
can_create = False can_create = False
can_edit = False can_edit = False
can_delete = False can_delete = False
def __init__(self, session):
super().__init__(User, session)
class QRCodeAdmin(AdminModelView): class QRCodeAdmin(AdminModelView):
...@@ -66,6 +60,3 @@ class ItemAdmin(AdminModelView): ...@@ -66,6 +60,3 @@ class ItemAdmin(AdminModelView):
'validators': [validators.Regexp(ICS_ID_RE, message='ICS id shall match [A-Z]{3}[0-9]{3}')] 'validators': [validators.Regexp(ICS_ID_RE, message='ICS id shall match [A-Z]{3}[0-9]{3}')]
} }
} }
def __init__(self, session):
super().__init__(Item, session)
...@@ -12,9 +12,8 @@ Create the WSGI application. ...@@ -12,9 +12,8 @@ Create the WSGI application.
import sqlalchemy as sa import sqlalchemy as sa
from flask import Flask from flask import Flask
from whitenoise import WhiteNoise from whitenoise import WhiteNoise
from . import settings from . import settings, models
from .extensions import db, migrate, login_manager, ldap_manager, bootstrap, admin, mail, jwt, toolbar from .extensions import db, migrate, login_manager, ldap_manager, bootstrap, admin, mail, jwt, toolbar
from .models import Action, Manufacturer, Model, Location, Status, Network, Host, Mac
from .admin.views import AdminModelView, ItemAdmin, UserAdmin, GroupAdmin, QRCodeAdmin from .admin.views import AdminModelView, ItemAdmin, UserAdmin, GroupAdmin, QRCodeAdmin
from .main.views import bp as main from .main.views import bp as main
from .users.views import bp as users from .users.views import bp as users
...@@ -93,17 +92,17 @@ def create_app(config=None): ...@@ -93,17 +92,17 @@ def create_app(config=None):
toolbar.init_app(app) toolbar.init_app(app)
admin.init_app(app) admin.init_app(app)
admin.add_view(GroupAdmin(db.session)) admin.add_view(GroupAdmin(models.Group, db.session))
admin.add_view(UserAdmin(db.session)) admin.add_view(UserAdmin(models.User, db.session))
admin.add_view(QRCodeAdmin(Action, db.session)) admin.add_view(QRCodeAdmin(models.Action, db.session))
admin.add_view(QRCodeAdmin(Manufacturer, db.session)) admin.add_view(QRCodeAdmin(models.Manufacturer, db.session))
admin.add_view(QRCodeAdmin(Model, db.session)) admin.add_view(QRCodeAdmin(models.Model, db.session))
admin.add_view(QRCodeAdmin(Location, db.session)) admin.add_view(QRCodeAdmin(models.Location, db.session))
admin.add_view(QRCodeAdmin(Status, db.session)) admin.add_view(QRCodeAdmin(models.Status, db.session))
admin.add_view(ItemAdmin(db.session)) admin.add_view(ItemAdmin(models.Item, db.session))
admin.add_view(AdminModelView(Network, db.session)) admin.add_view(AdminModelView(models.Network, db.session))
admin.add_view(AdminModelView(Host, db.session)) admin.add_view(AdminModelView(models.Host, db.session))
admin.add_view(AdminModelView(Mac, db.session)) admin.add_view(AdminModelView(models.Mac, db.session))
app.register_blueprint(main) app.register_blueprint(main)
app.register_blueprint(users) app.register_blueprint(users)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment