accrete 0.0.139__py3-none-any.whl → 0.0.141__py3-none-any.whl

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/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/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/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.dist-info → accrete-0.0.141.dist-info}/METADATA

@@ -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.dist-info → accrete-0.0.141.dist-info}/RECORD

@@ -12,7 +12,7 @@ accrete/storage.py,sha256=Jp3oE_uPMqgarjS_G49KDFrR2eSe4XuIJK9oAF_QBxk,1288
 accrete/tenant.py,sha256=vfalmdfDsjYbl-ol3RqvsTC-YnuQs0JuSC7o85UInG0,2289
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/urls.py,sha256=goDFR-yhOlLLy7AMi9pmh2aBkxdtZtwXNg6mwI2zPhU,227
-accrete/views.py,sha256=vYAWT5ZKeKYWBlrfImqhoUV6MqU2Kntcor0hCvxGm-s,5735
+accrete/views.py,sha256=JNv1T9Bv_eay5LcPauoSSeyga7ftNIZg9xdPSOQPUnI,5862
 accrete/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/country/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/country/admin.py,sha256=0dAcFPfC8c80fhKKOL26-5Wl1uWXBYrkUJEjo2sEkk4,329
@@ -64,7 +64,7 @@ accrete/contrib/ui/__init__.py,sha256=3kcANg-pw-KR_JdAV1C-EtgPceAQmYbNq5tUJ7e5X0
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
 accrete/contrib/ui/context.py,sha256=689qnX9u3Nqrw8t08td38X2PoSSH935qm6sQj5MPznE,2680
-accrete/contrib/ui/filter.py,sha256=9JO5-9CfnVA2jQz3SaQ1BlrV85c6O8KlCZEiGJIO1PY,13351
+accrete/contrib/ui/filter.py,sha256=zLTWWSvsfvwBMNWgpZqP2kRKXCVW_50mhTQyJA36ywo,13323
 accrete/contrib/ui/middleware.py,sha256=QprWR8FXK9iMPIvLQAeYASaUJSW0uD9BHoYroMKrph0,1560
 accrete/contrib/ui/models.py,sha256=Vjc0p2XbAPgE6HyTF6vll98A4eDhA5AvaQqsc4kQ9AQ,57
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
@@ -226,10 +226,10 @@ accrete/contrib/user/apps.py,sha256=oHDrAiHf-G57mZLyxqGJzRY2DbPprGFD-QgyVJG_ruI,
 accrete/contrib/user/auth_backends.py,sha256=doGdxil4fjhgY5oC2s8zueQq-bQsZ1fyiAo46HyBHLk,598
 accrete/contrib/user/forms.py,sha256=BpwF_t1-7BpBVmwLpIm6hdqUpPqajoR0ZGOJ8cmaO6M,3290
 accrete/contrib/user/middleware.py,sha256=qblcujwJsthopagyT-hPFq4HsMyGt-VvqZw5TQopBjk,403
-accrete/contrib/user/models.py,sha256=X8rr81gVgK2lf58yozGFGrEm7jDtBFCIIGnR_10fr3g,6228
+accrete/contrib/user/models.py,sha256=8vgDZ2Jf-aFOC12W1vKObaK9FJUwcuWwQWqAi2hXQZg,6257
 accrete/contrib/user/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/user/urls.py,sha256=_fBa--3NfyYN10Td7PGHpetJYy42SMqTyCCXhgynkEQ,407
-accrete/contrib/user/views.py,sha256=df6Ns5XO__BuTgkj1DoeNitT7cdeToh7u7gjycYwngY,3409
+accrete/contrib/user/views.py,sha256=oPiyyO7RnfI48iKCO7O5_HMk2vioNEUDowKRe-Xwzm0,3435
 accrete/contrib/user/locale/de/LC_MESSAGES/django.mo,sha256=p3rgUg6WltAVIMkQsjvjBqTsd_usLhSr1GH4Cyltc2c,433
 accrete/contrib/user/locale/de/LC_MESSAGES/django.po,sha256=f_Nxpo3HTm2L3f3zoHLfeWsZ-4IQp_EEVSku6TCZSvw,1870
 accrete/contrib/user/migrations/0001_initial.py,sha256=JWfM9PcMDfkJUdCjLWuWieGs6643qP0KdbCyr5uAZoY,2950
@@ -273,7 +273,7 @@ accrete/utils/forms.py,sha256=JJ3EY1xcVP6L10i5cSVgh57G0uvFUjiVwUCpEqmBCos,3407
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=2xTacvcpmDK_Bp4rAK7JdVLf8HU009LYNJ6eSpMgYZI,1014
 accrete/utils/views.py,sha256=PsKpUFjxCm6_l_nfVs-cNIY0lNTdkocm2uohR3o9eEo,5025
-accrete-0.0.139.dist-info/METADATA,sha256=V2BAlAqd5s7JUcN3dnmCjD39ecIhUfpGu_g9nmwFR2g,4953
-accrete-0.0.139.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.139.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
-accrete-0.0.139.dist-info/RECORD,,
+accrete-0.0.141.dist-info/METADATA,sha256=QLIHDvSd9FfMNLcAjZXpdmt8V50SY3laTZlfQhed0c0,4953
+accrete-0.0.141.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.141.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
+accrete-0.0.141.dist-info/RECORD,,