accrete 0.0.139__tar.gz → 0.0.141__tar.gz

{accrete-0.0.139 → accrete-0.0.141}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.139
+Version: 0.0.141
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2025 Benedikt Jilek

{accrete-0.0.139 → accrete-0.0.141}/accrete/contrib/ui/filter.py

@@ -33,8 +33,6 @@ class Filter:
     LABEL_OR = _('Or')
     LABEL_XOR = _('Not Or')
 
-    # EXCLUDE = ['tenant']
-
     DATE_FORMAT = '%Y-%m-%d'
 
     TYPES_INTEGER = [

{accrete-0.0.139 → accrete-0.0.141}/accrete/contrib/user/models.py

@@ -66,7 +66,7 @@ class UserManager(BaseUserManager):
         extra_fields.setdefault('is_active', False)
         return self._create_user(password, email, login, username, **extra_fields)
 
-    def create_superuser(self, email, password, username=None, **extra_fields):
+    def create_superuser(self, password, email, username=None, **extra_fields):
         extra_fields.setdefault('is_staff', True)
         extra_fields.setdefault('is_superuser', True)
         extra_fields.setdefault('is_active', True)
@@ -76,7 +76,7 @@ class UserManager(BaseUserManager):
         if extra_fields.get('is_superuser') is not True:
             raise ValueError('Superuser must have is_superuser=True.')
 
-        return self._create_user(email, password, username, **extra_fields)
+        return self._create_user(password, email, username, **extra_fields)
 
 
 class User(AbstractBaseUser, PermissionsMixin):
@@ -98,10 +98,6 @@ class User(AbstractBaseUser, PermissionsMixin):
             )
         ]
 
-    filter_exclude = [
-        'password'
-    ]
-
     username_validator = UnicodeUsernameValidator()
     login_validator = validate_member_login
 
@@ -211,3 +207,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     def all_tenants(self):
         tenants = Tenant.objects.filter(members__user=self)
         return tenants
+
+    @staticmethod
+    def exclude_from_filter():
+        return ['password']

{accrete-0.0.139 → accrete-0.0.141}/accrete/contrib/user/views.py

@@ -80,7 +80,7 @@ def user_change_password(request):
                 + f'?{request.GET.urlencode()}'
             )
         ctx.update(form=form)
-        return ui.modal_response(request, 'user/change_password.html', ctx)
+        return ui.modal_response(request, 'user/change_password.html', ctx, update=True)
     return render(request, 'user/change_password.html', ctx)
 
 
@@ -103,5 +103,5 @@ def user_change_email(request):
         if form.is_saved:
             return redirect('user:detail')
         ctx.update(form=form)
-        return ui.modal_response(request, 'user/change_email.html', ctx)
+        return ui.modal_response(request, 'user/change_email.html', ctx, update=True)
     return render(request, 'user/change_email.html', ctx)

{accrete-0.0.139 → accrete-0.0.141}/accrete/views.py

@@ -1,11 +1,10 @@
 import os
-from enum import Enum
 from functools import wraps
 from django.http import HttpResponse, HttpResponseNotFound
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import login_required
 from django.core.exceptions import ImproperlyConfigured
-from django.shortcuts import redirect, get_object_or_404
+from django.shortcuts import redirect, get_object_or_404, resolve_url
 from django.conf import settings
 from accrete.models import Tenant, Member
 from accrete.tenant import get_tenant, tenant_has_group, member_has_group
@@ -26,9 +25,10 @@ class TenantRequiredMixin(LoginRequiredMixin):
 
     def dispatch(self, request, *args, **kwargs):
         res = super().dispatch(request, *args, **kwargs)
-        tenant = self.get_tenant()
-        if not tenant:
+        if not self.get_tenant():
             return self.handle_tenant_not_set()
+        if self.request.user.is_superuser:
+            return res
         if not self.check_tenant_group():
             return self.handle_tenant_group_not_set()
         if not self.check_member_group():
@@ -36,7 +36,10 @@ class TenantRequiredMixin(LoginRequiredMixin):
         return res
 
     def handle_tenant_not_set(self):
-        return redirect(self.get_tenant_not_set_url())
+        return redirect(
+            resolve_url(self.get_tenant_not_set_url())
+            + f'?next={self.request.get_full_path_info()}'
+        )
 
     def handle_tenant_group_not_set(self):
         return redirect(self.get_group_not_set_url())

{accrete-0.0.139 → accrete-0.0.141}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.139'
+version = '0.0.141'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]