Merged master into release

opengisch · Mar 20, 2024 · b57015d · b57015d
2 parents f0f99f6 + cec8c6f
commit b57015d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docker-app/qfieldcloud/core/middleware/timezone.py b/docker-app/qfieldcloud/core/middleware/timezone.py
@@ -9,7 +9,7 @@ def __init__(self, get_response):
 
     def __call__(self, request):
         if request.user.is_authenticated and hasattr(
-            request.user.useraccount, "timezone"
+            request.user.useraccount, "useraccount"
         ):
             user_tz = request.user.useraccount.timezone
         elif settings.TIME_ZONE:

diff --git a/docker-app/qfieldcloud/subscription/admin.py b/docker-app/qfieldcloud/subscription/admin.py
@@ -119,6 +119,7 @@ class SubscriptionAdmin(QFieldCloudModelAdmin):
     fields = (
         "plan",
         "account",
+        "status",
         "active_since",
         "active_until",
         "billing_cycle_anchor_at",