From 0263b2921871fd572dc88cf0d850edd140a7d6d9 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 31 Jul 2021 11:18:59 +0200 Subject: [PATCH] fdfdfd --- drama/classes/user.py | 12 ++++++------ drama/routes/settings.py | 3 +-- drama/routes/static.py | 2 +- drama/templates/api.html | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drama/classes/user.py b/drama/classes/user.py index b69f9f213..98c7d29de 100644 --- a/drama/classes/user.py +++ b/drama/classes/user.py @@ -300,17 +300,17 @@ class User(Base, Stndrd, Age_times): @lazy def display_awards(self): - _awards = {} + awards = {} active_awards = [x for x in self.awards if not x.given] for a in active_awards: - if a.kind in _awards: - _awards[a.kind]['count'] += 1 + if a.kind in awards: + awards[a.kind]['count'] += 1 else: - _awards[a.kind] = a.type - _awards[a.kind]['count'] = 1 + awards[a.kind] = a.type + awards[a.kind]['count'] = 1 - return list(_awards.values()) + return sorted(list(awards.values()), key=lambda x: x.kind, reverse=True) @property @lazy diff --git a/drama/routes/settings.py b/drama/routes/settings.py index f314e7cb0..4429e3837 100644 --- a/drama/routes/settings.py +++ b/drama/routes/settings.py @@ -357,8 +357,7 @@ def settings_images_banner(v): v.bannerurl = imageurl g.db.add(v) - return render_template("settings_profile.html", - v=v, msg="Banner successfully updated.") + return render_template("settings_profile.html", v=v, msg="Banner successfully updated.") @app.post("/settings/delete/profile") diff --git a/drama/routes/static.py b/drama/routes/static.py index 390093a90..21a8437e3 100644 --- a/drama/routes/static.py +++ b/drama/routes/static.py @@ -1,4 +1,4 @@ -from drama.mail import * +patronsfrom drama.mail import * from drama.__main__ import app, limiter from drama.helpers.alerts import * diff --git a/drama/templates/api.html b/drama/templates/api.html index e6424192a..cc2ae3d44 100644 --- a/drama/templates/api.html +++ b/drama/templates/api.html @@ -1,5 +1,5 @@ {% extends "default.html" %} -{% block title %} +{% block content %} words words words {% endblock %} \ No newline at end of file