From 71789cc486f94d62a039046b5a922b696900b288 Mon Sep 17 00:00:00 2001 From: Kresten Laust Date: Sat, 7 Sep 2024 21:05:09 +0200 Subject: [PATCH 1/4] Fix issue with 'ignore' status not being updated (#484) --- stregsystem/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stregsystem/models.py b/stregsystem/models.py index 8c9435c1..1adea055 100644 --- a/stregsystem/models.py +++ b/stregsystem/models.py @@ -529,6 +529,7 @@ def process_submitted(cls, submitted_data, admin_user: User): processed_mobile_payment.status = row['status'] processed_mobile_payment.member = Member.objects.get(id=row['member'].id) processed_mobile_payment.submit_processed_mobile_payment(admin_user) + processed_mobile_payment.save() # Return how many records were modified. return len(mobile_payment_ids) From 8f022ac3212ba64426d0e4d3b9e402a5a6cd8586 Mon Sep 17 00:00:00 2001 From: Kresten Laust Date: Tue, 10 Sep 2024 13:06:27 +0200 Subject: [PATCH 2/4] Update trusted origins in CSRF-settings (#485) --- treo/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/treo/settings.py b/treo/settings.py index 4994f69b..91803883 100644 --- a/treo/settings.py +++ b/treo/settings.py @@ -72,7 +72,7 @@ CSRF_COOKIE_SECURE = cfg.getboolean("debug", "CSRF_COOKIE_SECURE") CSRF_COOKIE_HTTPONLY = cfg.getboolean("debug", "CSRF_COOKIE_HTTPONLY") -CSRF_TRUSTED_ORIGINS = ["https://fappen.fklub.dk"] +CSRF_TRUSTED_ORIGINS = ["https://fappen.fklub.dk", "https://stregsystem.fklub.dk"] SESSION_COOKIE_SECURE = cfg.getboolean("debug", "SESSION_COOKIT_SECURE") SECURE_BROWSER_XSS_FILTER = cfg.getboolean("debug", "SECURE_BROWSER_XSS_FILTER") From bba985260407749e982dee51f193e02551c4f064 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 14 Sep 2024 09:39:18 +0200 Subject: [PATCH 3/4] Upgrade header to modern HTML (#480) Co-authored-by: Kresten Laust --- .../static/stregsystem/stregsystem.css | 16 ++++++++ stregsystem/templates/stregsystem/base.html | 37 +++++++------------ 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/stregsystem/static/stregsystem/stregsystem.css b/stregsystem/static/stregsystem/stregsystem.css index de850b9f..ffafefa6 100644 --- a/stregsystem/static/stregsystem/stregsystem.css +++ b/stregsystem/static/stregsystem/stregsystem.css @@ -3,6 +3,22 @@ body { background-color: white; } +header { + display: grid; + grid-template-columns: 1fr auto 1fr; + padding: 3px 4vw; + column-gap: 4vw; + text-align: center; + place-items: center; + + & .left { + justify-self: start; + } + & .right { + justify-self: end; + } +} + h1 { color: red } /*div { border-color: red; diff --git a/stregsystem/templates/stregsystem/base.html b/stregsystem/templates/stregsystem/base.html index 76a97b27..8c521140 100644 --- a/stregsystem/templates/stregsystem/base.html +++ b/stregsystem/templates/stregsystem/base.html @@ -28,29 +28,20 @@
- - - - - - - -
-
- -
-
-

{% block heading %}TREOENs STREGSYSTEM -{% if room.id != 1 %} - : {{room.description}} -{% endif %} -{% endblock %}

-
-
- - -
-
+
+
+ +
+

+ {% block heading %} + TREOENs STREGSYSTEM {% if room.id != 1 %} : {{room.description}} {% endif %} + {% endblock %} +

+
+ + +
+

{% block content %}{% endblock %} From 19604808a4455036267c38f7585d35dbf4f3f289 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 14 Sep 2024 09:50:42 +0200 Subject: [PATCH 4/4] Remove old autofocus hack (#472) Co-authored-by: Kresten Laust --- stregsystem/templates/stregsystem/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stregsystem/templates/stregsystem/base.html b/stregsystem/templates/stregsystem/base.html index 8c521140..2ad98afd 100644 --- a/stregsystem/templates/stregsystem/base.html +++ b/stregsystem/templates/stregsystem/base.html @@ -19,7 +19,7 @@ var media_url = "{% get_media_prefix %}"; - + {% comment %}
{% filter escape %}{% debug %}{% endfilter %}