diff --git a/app/admin/routes.py b/app/admin/routes.py index 99f48a3..2ddf4e7 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -39,8 +39,8 @@ def index(): @fresh_login_required @admin_required def list_deployments(): - alldeployments = Deployment.query.filter_by(deleted=False).order_by(Deployment.daysleft.asc()).all() - return render_template('admin/list_deployments.html', deployments=alldeployments) + AllDeploymentProtected = Deployment.query.filter_by(deleted=False).order_by(Deployment.daysleft.asc()).all() + return render_template('admin/list_deployments.html', deployments=AllDeploymentProtected) @admin.route("/listservices", methods=['GET']) @fresh_login_required @@ -56,14 +56,14 @@ def list_domains(): alldomains = Domain.query.filter_by(deleted=False).order_by(Domain.daysleft.asc()).all() return render_template('admin/list_domains.html', domains=alldomains) -@admin.route("/listrecyclebin", methods=['GET']) +@admin.route("/listarchive", methods=['GET']) @fresh_login_required @admin_required -def list_recyclebin(): +def list_archive(): deployments = Deployment.query.filter_by(protected=False).order_by(Deployment.daysleft.asc()).all() services = Service.query.filter_by(deleted=True).all() domains = Domain.query.filter_by(deleted=True).all() - return render_template('admin/list_recyclebin.html', deployments=deployments, services=services, domains=domains) + return render_template('admin/list_archive.html', deployments=deployments, services=services, domains=domains) @admin.route("/listusers", methods=['GET']) @fresh_login_required diff --git a/app/templates/admin/admin_cloud.html b/app/templates/admin/admin_cloud.html index ae13a3a..e093cc5 100644 --- a/app/templates/admin/admin_cloud.html +++ b/app/templates/admin/admin_cloud.html @@ -1,7 +1,3 @@ -
+