From 31d6db46fd34e6b71725d7d5da0197c6f332ad38 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 20 Dec 2021 17:17:43 +0200 Subject: [PATCH] sfddsf --- files/routes/settings.py | 4 ++-- files/routes/static.py | 6 +++--- files/templates/CHRISTMAS/header-tw.html | 4 ++-- files/templates/CHRISTMAS/header.html | 2 +- files/templates/header.html | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/files/routes/settings.py b/files/routes/settings.py index 55623c89b..bf1af3f97 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -50,9 +50,9 @@ def sex(v): email=f"{email}@gmail.com" emails.append(email.lower()) - users = g.db.query(User).filter(User.patron > 0, User.patron < 5, User.email != None).all() + users = g.db.query(User).filter(User.patron > 0, User.patron < 5).all() for u in users: - if u.email.lower() not in emails: print(u.username) + if not u.email or u.email.lower() not in emails: print(u.username) return "sex" diff --git a/files/routes/static.py b/files/routes/static.py index b352c0c1b..d8263f205 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -180,12 +180,12 @@ def admins(v): @auth_desired def log(v): - page = int(request.args.get("page",1)) - admin = request.args.get("admin") + page = int(request.values.get("page",1)) + admin = request.values.get("admin") if admin: admin_id = get_id(admin) else: admin_id = 0 - kind = request.args.get("kind") + kind = request.values.get("kind") if v and v.admin_level > 1: types = ACTIONTYPES else: types = ACTIONTYPES2 diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html index f96dc6196..b21e8b713 100644 --- a/files/templates/CHRISTMAS/header-tw.html +++ b/files/templates/CHRISTMAS/header-tw.html @@ -41,7 +41,7 @@ @@ -139,7 +139,7 @@
- +
{% if v %} diff --git a/files/templates/CHRISTMAS/header.html b/files/templates/CHRISTMAS/header.html index da61aaed3..230b9ef1e 100644 --- a/files/templates/CHRISTMAS/header.html +++ b/files/templates/CHRISTMAS/header.html @@ -18,7 +18,7 @@
- +