accrete 0.0.138__tar.gz → 0.0.140__tar.gz

{accrete-0.0.138 → accrete-0.0.140}/PKG-INFO

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

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/ui/__init__.py

@@ -7,6 +7,7 @@ from . context import (
     TableContext,
     TableRowContext,
     ModalContext,
-    OobContext
+    OobContext,
+    MessageContext
 )
 from .utils import modal_response, add_trigger

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/ui/context.py

@@ -116,3 +116,10 @@ class OobContext(BaseContext):
             'tag': self.tag
         }})
         return res
+
+
+@dataclass(kw_only=True)
+class MessageContext(BaseContext):
+
+    persistent: bool = False
+    append: bool = False

{accrete-0.0.138 → accrete-0.0.140}/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.138 → accrete-0.0.140}/accrete/contrib/ui/templates/ui/form_error.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% if form.non_field_errors or form.save_error %}
-    <div class="notification is-danger is-light">
+    <div class="notification is-danger is-light" style="word-wrap: break-word;">
         {{ form.non_field_errors }}
         {% if form.save_error %}
             <p>{{ form.save_error }}</p>

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/ui/templates/ui/layout.html

@@ -203,7 +203,7 @@
                                 <div id="content-right-header" class="is-flex is-flex-wrap-wrap">
                                     {% block header_right %}{% endblock %}
                                 </div>
-                                <button class="button is-subtle is-align-self-baseline m-1" style="border-radius: var(--bulma-radius-rounded)" x-on:click="showContentRight = false;">
+                                <button class="button is-light is-align-self-baseline m-1" style="border-radius: var(--bulma-radius-medium)" x-on:click="showContentRight = false;">
                                     <span class="icon"><i class="fa fa-xmark"></i></span>
                                 </button>
                             </div>

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/ui/templates/ui/list.html

@@ -10,11 +10,11 @@
                 <div id="list-entry-{{ object.pk }}" class="list-entry cell pb-0" style="height: {{ column_height }}{{ column_height_unit }}">
                     <div class="box p-3"
                          style="word-break: break-word; height: 100%; overflow-y: auto; {% if object.get_absolute_url %}cursor:pointer;{% endif %}"
-                         {% if object.get_absolute_url %}
-                             hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-target="#content-right-header" hx-select="#content-right-header" hx-select-oob="#content-right" hx-swap="outerHTML"
-                             {% if detail_enabled %}
-                                x-on:click="$dispatch('unselect-list-entry'); showContentRight = true; selected = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });" x-bind:class="selected ? 'box selected' : ''"
-                             {% endif %}
+                         {% if object.get_absolute_url and detail_enabled %}
+                            hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-target="#content-right-header" hx-select="#content-right-header" hx-select-oob="#content-right" hx-swap="outerHTML"
+                            x-on:click="$dispatch('unselect-list-entry'); showContentRight = true; selected = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });" x-bind:class="selected ? 'box selected' : ''"
+                         {% elif object.get_absolute_url and not detail_enabled %}
+                             hx-get="{{ object.get_absolute_url }}{% querystring %}" hx-target="body" hx-push-url="true"
                          {% endif %}
                          x-data="{selected: false}" @unselect-list-entry.window="selected = false"
                     >

accrete-0.0.140/accrete/contrib/ui/templates/ui/message.html

@@ -0,0 +1,14 @@
+{% load ui %}
+
+{% if messages %}
+    {% for message in messages %}
+        <div hx-swap-oob="{% if append %}beforeend:#message{% else %}innerHTML:#message{% endif %}">
+            <div class="mb-2" style="min-width: 340px; max-width: 340px" x-data="{ show: false }" x-show="show" x-cloak="" x-init="show = true; {% if not persistent %}setTimeout(() => show = false, 4000){% endif %}" x-transition.duration.200ms>
+                <div class="notification has-text-centered {{ message|message_class }}">
+                    {% if persistent %}<button class="delete" x-on:click="show = false;"></button>{% endif %}
+                    {{ message }}
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+{% endif %}

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/ui/templates/ui/modal.html

@@ -12,10 +12,10 @@
     <button id="{{ modal_id }}-background" class="modal-background" @click="$dispatch('close-modal-{{ modal_id }}')" style="cursor: default"></button>
     <div class="modal-card" x-show="showModal" x-transition.duration.200ms x-init="$nextTick(() => {showModal = true;})" >
         <header class="modal-card-head">
-            <p class="modal-card-title">
+            <p class="modal-card-title is-flex-shrink-1">
                 {{ title }}
             </p>
-            <button class="delete" aria-label="close" @click="$dispatch('close-modal-{{ modal_id }}')"></button>
+            <button class="delete is-align-self-baseline" aria-label="close" @click="$dispatch('close-modal-{{ modal_id }}')"></button>
         </header>
         <section class="modal-card-body">
             {% block modal_content %}{% endblock %}

accrete-0.0.140/accrete/contrib/user/migrations/0008_remove_user_no_email_for_managed_user_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.7 on 2025-03-23 08:11
+
+import accrete.contrib.user.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0007_user_managed_login'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='user',
+            name='no_email_for_managed_user',
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='language_code',
+            field=models.CharField(blank=True, default=accrete.contrib.user.models.default_language_code, max_length=10, null=True, verbose_name='Language'),
+        ),
+    ]

{accrete-0.0.138 → accrete-0.0.140}/accrete/contrib/user/models.py

@@ -35,6 +35,10 @@ def validate_member_login(login: str) -> None:
         raise ValidationError(message)
 
 
+def default_language_code():
+    return settings.LANGUAGE_CODE
+
+
 class UserManager(BaseUserManager):
     use_in_migrations = True
 
@@ -87,11 +91,6 @@ class User(AbstractBaseUser, PermissionsMixin):
                 name='email_or_login_set',
                 violation_error_message='E-Mail or Login must be set'
             ),
-            models.CheckConstraint(
-                condition=Q(is_managed=False, email__isnull=False) | Q(is_managed=True, email__isnull=True),
-                name='no_email_for_managed_user',
-                violation_error_message='Managed users must not have an E-Mail address'
-            ),
             models.CheckConstraint(
                 condition=Q(is_managed=True, login__isnull=False) | Q(is_managed=False),
                 name='managed_login',
@@ -99,10 +98,6 @@ class User(AbstractBaseUser, PermissionsMixin):
             )
         ]
 
-    filter_exclude = [
-        'password'
-    ]
-
     username_validator = UnicodeUsernameValidator()
     login_validator = validate_member_login
 
@@ -178,7 +173,8 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_('Language'),
         max_length=10,
         null=True,
-        blank=True
+        blank=True,
+        default=default_language_code
     )
 
     theme = models.CharField(
@@ -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.138 → accrete-0.0.140}/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.140/accrete/migrations/0006_alter_member_user.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.1.7 on 2025-03-23 10:21
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0005_accessgroup_apply_on_alter_member_access_groups_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='member',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

accrete-0.0.140/accrete/migrations/0007_accessgroup_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-31 20:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0006_alter_member_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='accessgroup',
+            name='description',
+            field=models.TextField(blank=True, null=True, verbose_name='Description'),
+        ),
+    ]

{accrete-0.0.138 → accrete-0.0.140}/accrete/models.py

@@ -90,7 +90,7 @@ class Member(models.Model):
     user = models.ForeignKey(
         to=settings.AUTH_USER_MODEL,
         related_name='memberships',
-        on_delete=models.PROTECT
+        on_delete=models.CASCADE
     )
 
     tenant = models.ForeignKey(
@@ -136,6 +136,12 @@ class AccessGroup(models.Model):
         max_length=255
     )
 
+    description = models.TextField(
+        verbose_name=_('Description'),
+        null=True,
+        blank=True
+    )
+
     code = models.CharField(
         verbose_name=_('Code'),
         max_length=100

{accrete-0.0.138 → accrete-0.0.140}/accrete/tenant.py

@@ -39,11 +39,6 @@ class Unscoped:
         self.tenant = tenant
 
     def __enter__(self):
-        if self.tenant is None:
-            _logger.warning(
-                'Entering unscoped context manager with tenant already set to None!',
-                stack_info=True
-            )
         set_tenant(False)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -57,7 +52,7 @@ def unscoped():
 def per_tenant(include: Q = None, exclude: Q = None):
     def decorator(f):
         def wrapper(*args, **kwargs):
-            tenants: QuerySet = apps.get_model('accrete', 'Tenant').objects.all()
+            tenants = apps.get_model('accrete', 'Tenant').objects.all()
             if include is not None:
                 tenants = tenants.filter(include)
             if exclude is not None:
@@ -74,6 +69,15 @@ def per_tenant(include: Q = None, exclude: Q = None):
     return decorator
 
 
+def unscope():
+    def decorator(f):
+        def wrapper(*args, **kwargs):
+            with unscoped():
+                f(*args, **kwargs)
+        return wrapper
+    return decorator
+
+
 def tenant_has_group(access_group_code: str) -> bool:
     tenant = get_tenant()
     if not tenant:

{accrete-0.0.138 → accrete-0.0.140}/accrete/utils/views.py

@@ -141,8 +141,7 @@ def method_not_allowed(method: str, allowed: list[str]) -> HttpResponseNotAllowe
 def render_templates(
     templates: list[str | tuple[str, dict]],
     context: dict = None,
-    request=None,
-    log_not_found: bool = False
+    request=None
 ) -> str:
     context = {} if context is None else context
     content = ''
@@ -150,13 +149,11 @@ def render_templates(
         if isinstance(template, tuple):
             template_name, template_context = template
         else:
-            template_name = template
-            template_context = context
+            template_name, template_context = template, context
         try:
             content += render_to_string(template_name, template_context, request)
         except TemplateDoesNotExist as e:
-            if log_not_found:
-                _logger.warning(repr(e))
+            _logger.warning(repr(e))
         except Exception as e:
             _logger.exception(repr(e))
             raise e

{accrete-0.0.138 → accrete-0.0.140}/accrete/views.py

@@ -1,29 +1,34 @@
 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
-from . import config
+from accrete import config
 
 
 class TenantRequiredMixin(LoginRequiredMixin):
 
+    # Redirect to the specified url if the group check fails
     TENANT_NOT_SET_URL = None
     GROUP_NOT_SET_URL = None
+
+    # If set, one of the supplied groups must be present on the
+    # tenant or member respectively. If the list item is of type tuple,
+    # all the groups in the tuple must be present.
     TENANT_GROUPS: list[str | tuple[str]] = []
     MEMBER_GROUPS: list[str | tuple[str]] = []
 
     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():
@@ -31,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())
@@ -41,8 +49,8 @@ class TenantRequiredMixin(LoginRequiredMixin):
 
     def get_tenant_not_set_url(self):
         tenant_not_set_url = (
-                self.TENANT_NOT_SET_URL
-                or settings.ACCRETE_TENANT_NOT_SET_URL
+            self.TENANT_NOT_SET_URL
+            or config.ACCRETE_TENANT_NOT_SET_URL
         )
         if not tenant_not_set_url:
             cls_name = self.__class__.__name__
@@ -57,7 +65,7 @@ class TenantRequiredMixin(LoginRequiredMixin):
     def get_group_not_set_url(self):
         group_not_set_url = (
             self.GROUP_NOT_SET_URL
-            or settings.ACCRETE_GROUP_NOT_SET_URL
+            or config.ACCRETE_GROUP_NOT_SET_URL
         )
         if not group_not_set_url:
             cls_name = self.__class__.__name__

{accrete-0.0.138 → accrete-0.0.140}/pyproject.toml

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

accrete-0.0.138/accrete/contrib/ui/templates/ui/message.html

@@ -1,13 +0,0 @@
-{% load ui %}
-
-{% if messages %}
-    {% for message in messages %}
-        <div hx-swap-oob="beforeend:#message">
-            <div class="mb-2" style="min-width: 330px; max-width: 330px" x-data="{ show: false }" x-show="show" x-cloak="" x-init="show = true; setTimeout(() => show = false, 4000)" x-transition.duration.200ms>
-                <div class="notification has-text-centered is-light {{ message|message_class }}">
-                    <p>{{ message }}</p>
-                </div>
-            </div>
-        </div>
-    {% endfor %}
-{% endif %}