Revert "Add flask-admin"

This reverts commit dd6257a0a042f1ae82bcd00c999fade3746abdbf.

diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html
index 307821f5740ccf95e7d39b6626688537fd5c147c..a2ac6d53bef9858303452c8cf3a33163e42684ae 100644 (file)
--- a/app/templates/admin/list.html
+++ b/app/templates/admin/list.html
@@ -1,12 +1,11 @@
 {% extends "base.html" %}
 
 {% block title %}
-Admin
+       Admin Tools
 {% endblock %}
 
 {% block content %}
        <ul>
-               <li><a href="db/">Database</a></li>
                <li><a href="{{ url_for('user_list_page') }}">User list</a></li>
                <li><a href="{{ url_for('tag_list_page') }}">Tag Editor</a></li>
                <li><a href="{{ url_for('license_list_page') }}">License Editor</a></li>

diff --git a/app/views/admin.py b/app/views/admin.py
index 19bcd4b036ca1e27c3fdf6f0a069a9ff163774bf..029d4c98a1dc38891c78f7556c9f845827540496 100644 (file)
--- a/app/views/admin.py
+++ b/app/views/admin.py
@@ -27,37 +27,6 @@ from flask_wtf import FlaskForm
 from wtforms import *
 from app.utils import loginUser, rank_required, triggerNotif
 import datetime
-from flask_admin import Admin
-from flask_admin.contrib.sqla import ModelView
-
-class MyModelView(ModelView):
-       def is_accessible(self):
-               return current_user.is_authenticated and current_user.rank.atLeast(UserRank.ADMIN)
-
-       def inaccessible_callback(self, name, **kwargs):
-               # redirect to login page if user doesn't have access
-               if current_user.is_authenticated:
-                       abort(403)
-               else:
-                       return redirect(url_for('user.login', next=request.url))
-
-admin = Admin(app, name='ContentDB', template_mode='bootstrap3', url="/admin/db")
-admin.add_view(MyModelView(User, db.session))
-admin.add_view(MyModelView(Package, db.session))
-admin.add_view(MyModelView(Dependency, db.session))
-admin.add_view(MyModelView(EditRequest, db.session))
-admin.add_view(MyModelView(EditRequestChange, db.session))
-admin.add_view(MyModelView(ForumTopic, db.session))
-admin.add_view(MyModelView(License, db.session))
-admin.add_view(MyModelView(MetaPackage, db.session))
-admin.add_view(MyModelView(Notification, db.session))
-admin.add_view(MyModelView(PackageRelease, db.session))
-admin.add_view(MyModelView(PackageScreenshot, db.session))
-admin.add_view(MyModelView(Tag, db.session))
-admin.add_view(MyModelView(Thread, db.session))
-admin.add_view(MyModelView(ThreadReply, db.session))
-admin.add_view(MyModelView(UserEmailVerification, db.session))
-
 
 @app.route("/admin/", methods=["GET", "POST"])
 @rank_required(UserRank.ADMIN)
@@ -110,8 +79,8 @@ def admin_page():
 
                                rel = PackageRelease()
                                rel.package  = package
-                               rel.title       = datetime.date.today().isoformat()
-                               rel.url   = ""
+                               rel.title    = datetime.date.today().isoformat()
+                               rel.url      = ""
                                rel.task_id  = uuid()
                                rel.approved = True
                                db.session.add(rel)
@@ -129,7 +98,6 @@ def admin_page():
        deleted_packages = Package.query.filter_by(soft_deleted=True).all()
        return render_template("admin/list.html", deleted_packages=deleted_packages)
 
-
 class SwitchUserForm(FlaskForm):
        username = StringField("Username")
        submit = SubmitField("Switch")

diff --git a/requirements.txt b/requirements.txt
index c65137818a9a1d41d3fc90482888a2744d85be6c..c590e1feead5e72b5afabc2c1e41612863731683 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,3 @@ Flask-FlatPages==0.6
 Flask-Migrate==2.1.1
 pillow==5.1.0
 GitPython==2.1.10
-flask-admin==1.5.1