diff --git a/files/routes/users.py b/files/routes/users.py index 18f95a6b02..97804ad21e 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -361,7 +361,7 @@ def leaderboard(v): sq = g.db.query(Badge.user_id, func.count(Badge.user_id).label("count"), func.rank().over(order_by=func.count(Badge.user_id).desc()).label("rank")).order_by(func.count(Badge.user_id).desc()).group_by(Badge.user_id).subquery() users11 = g.db.query(User, sq.c.count).join(sq, User.id==sq.c.user_id).limit(25).all() - pos11 = g.db.query(sq.c.rank, sq.c.count).filter(User.id == v.id).limit(1).one() + pos11 = g.db.query(sq.c.rank, sq.c.count).join(sq, User.id==sq.c.user_id).filter(User.id == v.id).limit(1).one() try: pos13 = [x[0].id for x in users13].index(v.id) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 2f03d2ccdb..854988f0ec 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 35b965f3b3..8f6dd66ce7 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,7 +8,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 7162323f49..26b49cb13f 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index f28a001801..9aee08e1a3 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -19,7 +19,7 @@ - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 2e2a327196..9d7574c54f 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 9b4c4a59ca..b8f26cb1a2 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index b06f3a993c..38ce5031b5 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 04f7759565..004b635a98 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index f7982aeb10..d43b8abd24 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}