accrete 0.0.143__py3-none-any.whl → 0.0.144__py3-none-any.whl

accrete/contrib/user/templates/user/user_preferences.html

@@ -0,0 +1,43 @@
+{#{% extends 'ui/layout.html' %}#}
+{% load i18n %}
+{% load partials %}
+{% load ui %}
+
+{% partialdef header %}
+    {% if not user.is_managed %}
+        <button class="button is-light" hx-get="{% url 'user:change_password' %}" hx-swap="none">
+            <span>{% translate 'Change Password' %}</span>
+        </button>
+        <button class="button is-light" hx-get="{% url 'user:change_email' %}" hx-swap="none">
+            <span>{% translate 'Change E-Mail' %}</span>
+        </button>
+    {% endif %}
+{% endpartialdef %}
+
+{% partialdef data %}
+    <section class="box">
+        <form id="user-form" hx-post="{% url 'user:detail' %}" hx-trigger="change changed" hx-select="#user-form" hx-swap="outerHTML" hx-select-oob="#navbar-user-name">
+            {% csrf_token %}
+            <div class="columns">
+                <div class="column">
+                    {% include 'ui/form_error.html' %}
+                </div>
+            </div>
+            <div class="columns m-0">
+                <div class="column is-6">
+                    {% translate 'Username' as username %}
+                    {{ form.username|wrap_label:username }}
+                    {{ form.first_name|wrap_label }}
+                    {{ form.last_name|wrap_label }}
+                </div>
+                <div class="column is-6">
+                    {% if not user.is_managed %}
+                        {{ user|wrap_model_field:'email' }}
+                    {% endif %}
+                    {{ form.language_code|wrap_label }}
+                    {{ form.theme|wrap_label }}
+                </div>
+            </div>
+        </form>
+    </section>
+{% endpartialdef %}

accrete/contrib/user/views.py

@@ -40,21 +40,21 @@ def user_detail(request):
         initial={'language_code': request.user.language_code},
         instance=request.user
     )
-    ctx = ui.Context(
-        title=_('User Preferences'),
-        extra=dict(
-            user=request.user,
-            form=form
-        )
-    ).dict()
+    refresh = False
     if request.method == 'POST':
         form = save_form(UserForm(request.POST, instance=request.user))
-        ctx.update(form=form)
         if form.is_saved:
-            res = render(request, 'user/user_form.html', ctx)
-            res.headers['HX-Refresh'] = 'true'
-            return res
-    return render(request, 'user/user_form.html', ctx)
+            refresh = True
+    res = ui.WindowResponse(
+        title=str(_('User Preferences')),
+        overview_template='user/user_preferences.html#data',
+        header_template='user/user_preferences.html#header',
+        context=dict(user=request.user, form=form),
+        is_centered=True
+    ).response(request, replace_body=False)
+    if refresh:
+        res.headers['HX-Refresh'] = 'true'
+    return res
 
 
 @login_required()
@@ -62,15 +62,7 @@ def user_change_password(request):
     if request.user.is_managed:
         return HttpResponseForbidden()
     form = ChangePasswordForm(instance=request.user)
-    ctx = ui.ModalContext(
-        title=_('Change Password'),
-        modal_id='change-password',
-        blocking=True,
-        extra=dict(
-            form=form,
-            user=request.user
-        )
-    ).dict()
+    update = bool(request.method == 'POST')
     if request.method == 'POST':
         form = save_form(ChangePasswordForm(request.POST, instance=request.user))
         if form.is_saved:
@@ -79,9 +71,13 @@ def user_change_password(request):
                 resolve_url('user:detail')
                 + f'?{request.GET.urlencode()}'
             )
-        ctx.update(form=form)
-        return ui.modal_response(request, 'user/change_password.html', ctx, update=True)
-    return render(request, 'user/change_password.html', ctx)
+    return ui.ModalResponse(
+        title=str(_('Change Password')),
+        modal_id='change-password',
+        template='user/change_password.html',
+        is_update=update,
+        context=dict(form=form, user=request.user)
+    ).response(request)
 
 
 @login_required()
@@ -89,19 +85,22 @@ def user_change_email(request):
     if request.user.is_managed:
         return HttpResponseForbidden()
     form = ChangeEmailForm(instance=request.user)
-    ctx = ui.ModalContext(
-        title=_('Change E-Mail'),
-        modal_id='change-email',
-        blocking=True,
-        extra=dict(
-            form=form,
-            user=request.user
-        )
-    ).dict()
+    update = bool(request.method == 'POST')
     if request.method == 'POST':
         form = save_form(ChangeEmailForm(request.POST, instance=request.user))
         if form.is_saved:
-            return redirect('user:detail')
-        ctx.update(form=form)
-        return ui.modal_response(request, 'user/change_email.html', ctx, update=True)
-    return render(request, 'user/change_email.html', ctx)
+            return redirect(
+                resolve_url('user:detail')
+                + f'?{request.GET.urlencode()}'
+            )
+    return ui.ModalResponse(
+        title=str(_('Change E-Mail')),
+        modal_id='change-email',
+        template='user/change_email.html',
+        is_update=update,
+        context=dict(form=form, user=request.user)
+    ).response(request)
+
+
+def password_forgotten(request):
+    return render(request, 'user/')

accrete/migrations/0008_alter_member_access_groups_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.1 on 2025-05-24 09:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0007_accessgroup_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='member',
+            name='access_groups',
+            field=models.ManyToManyField(blank=True, through='accrete.MemberAccessGroupRel', through_fields=('member', 'access_group'), to='accrete.accessgroup'),
+        ),
+        migrations.AlterField(
+            model_name='tenant',
+            name='access_groups',
+            field=models.ManyToManyField(blank=True, through='accrete.TenantAccessGroupRel', through_fields=('tenant', 'access_group'), to='accrete.accessgroup'),
+        ),
+    ]

accrete/utils/__init__.py

@@ -1,5 +1,6 @@
 from . import dates
 from .forms import (
+    FormResult,
     save_form,
     save_forms,
     inline_vals_from_post,

accrete/utils/forms.py

@@ -26,14 +26,22 @@ class FormResult:
         return self.form.__getitem__(item)
 
 
-def save_form(form: Form | ModelForm, commit=True, reraise=False) -> FormResult:
+def save_form(
+    form: Form | ModelForm,
+    *,
+    commit: bool = True,
+    check_changed: bool = False,
+    reraise: bool = False
+) -> FormResult:
     if not hasattr(form, 'save'):
         raise AttributeError('Form must have method "save" implemented.')
     result = FormResult(form=form)
+    changed = not check_changed or form.has_changed()
     try:
         if form.is_valid():
-            with transaction.atomic():
-                result.res = form.save(commit=commit)
+            if changed:
+                with transaction.atomic():
+                    result.res = form.save(commit=commit)
             result.is_saved = True
     except Exception as e:
         result.save_error = repr(e)

accrete/utils/views.py

@@ -134,8 +134,7 @@ def cast_param(params: dict, param: str, cast_to: Callable, default):
 
 
 def method_not_allowed(method: str, allowed: list[str]) -> HttpResponseNotAllowed | None:
-    if method not in allowed:
-        return HttpResponseNotAllowed(allowed)
+    return None if method in allowed else HttpResponseNotAllowed(allowed)
 
 
 def render_templates(

accrete/views.py

@@ -24,16 +24,15 @@ class TenantRequiredMixin(LoginRequiredMixin):
     MEMBER_GROUPS: list[str | tuple[str]] = []
 
     def dispatch(self, request, *args, **kwargs):
-        res = super().dispatch(request, *args, **kwargs)
         if not self.get_tenant():
             return self.handle_tenant_not_set()
         if self.request.user.is_superuser:
-            return res
+            return super().dispatch(request, *args, **kwargs)
         if not self.check_tenant_group():
             return self.handle_tenant_group_not_set()
         if not self.check_member_group():
             return self.handle_member_group_not_set()
-        return res
+        return super().dispatch(request, *args, **kwargs)
 
     def handle_tenant_not_set(self):
         return redirect(

{accrete-0.0.143.dist-info → accrete-0.0.144.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.143
+Version: 0.0.144
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2025 Benedikt Jilek
@@ -31,7 +31,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.10
-Requires-Dist: django>=5.1
+Requires-Dist: django>=5.2
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
 Requires-Dist: django-celery-beat; extra == 'contrib'

{accrete-0.0.143.dist-info → accrete-0.0.144.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=JNv1T9Bv_eay5LcPauoSSeyga7ftNIZg9xdPSOQPUnI,5862
+accrete/views.py,sha256=O8VytX3LtDizhWla_uRdXUiRnfGbgs9Z4xtubwqIOA4,5883
 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
@@ -23,7 +23,7 @@ accrete/contrib/country/migrations/0002_auto_20250219_1759.py,sha256=hSP0WEErHHJ
 accrete/contrib/country/migrations/0003_alter_country_options.py,sha256=0reOOdHuApMA5pw4ga6BW63TCG2U1i8T8oSug7EjUXw,428
 accrete/contrib/country/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/log/admin.py,sha256=xeuLk1GdU_M0rZR8SQUzcMeWvV9ud0hz_LJmaut5eJE,1211
+accrete/contrib/log/admin.py,sha256=g-wdWF2O62rR0e_rLSgof_z8m42Qqv5VBrl_sFB0qlo,1212
 accrete/contrib/log/apps.py,sha256=O0Cje3MmpxPToJVgO195lBg0tRCy9Ou87-ntcdGBKM0,369
 accrete/contrib/log/config.py,sha256=vRzPVbiUfpo5NGtgiJv5mEKR_h3qsYI_brxjni6-Z-Y,132
 accrete/contrib/log/helper.py,sha256=n5QXPf4Lo8NvxDaJifZs4QVNJdiNyr17e_z26QT9V-U,2514
@@ -55,21 +55,20 @@ accrete/contrib/system_mail/admin.py,sha256=9hXwwfZn446juyRoBOygLWm12X6N9waRC-1L
 accrete/contrib/system_mail/apps.py,sha256=yIWgsa5GV8NPOJBtDZQJljSZ5v_mOP6VJrTfo_HkLF8,169
 accrete/contrib/system_mail/forms.py,sha256=AQlQW0hW3KM5cU-y02DWb7HlCD4pcJAD7L5UZmqmnTc,750
 accrete/contrib/system_mail/models.py,sha256=mTx8YAtyyrUE2B8iKQDyJVsUqN1EGHg8XKgdoWibZ9g,880
-accrete/contrib/system_mail/tasks.py,sha256=W3q40AxcjGFt7wtuvblQ_WFYIaipYF-WWkDYGvbkYhQ,1326
+accrete/contrib/system_mail/tasks.py,sha256=Q9KLh_exm_KTr7ZfyNJ6KPGh5P-Nkipf0tScWRyzZUQ,1330
 accrete/contrib/system_mail/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/system_mail/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 accrete/contrib/system_mail/migrations/0001_initial.py,sha256=6cwkkRXGjXvwXoMjjgmWmcPyXSTlUbhW1vMiHObk9MQ,1074
 accrete/contrib/system_mail/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/__init__.py,sha256=7zRjbKxFZ_ox5XQmHmfxbKKJRcm_wxgmjXS759GdlEo,328
+accrete/contrib/ui/__init__.py,sha256=DTl4vnTWdYTdChIPv--iYzRGAKi9uVx6NGxrF36iO6Q,365
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/context.py,sha256=7FBNcPG77dU7asMomiRACP1bypE3lbsHXdg90MXbjf4,2616
-accrete/contrib/ui/filter.py,sha256=zLTWWSvsfvwBMNWgpZqP2kRKXCVW_50mhTQyJA36ywo,13323
+accrete/contrib/ui/filter.py,sha256=WWELsSZF-v7FxAWw1gGvYHFBB0BhmQWuWacI_joTKas,13703
 accrete/contrib/ui/middleware.py,sha256=QprWR8FXK9iMPIvLQAeYASaUJSW0uD9BHoYroMKrph0,1560
 accrete/contrib/ui/models.py,sha256=Vjc0p2XbAPgE6HyTF6vll98A4eDhA5AvaQqsc4kQ9AQ,57
+accrete/contrib/ui/response.py,sha256=vsSr4P3icnGflHv9zCfozlYUPESwtEEiugFAYUKQn9M,15482
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=5XUfK85HYWYf7oopMoJEEYmQ6pNgHgZBErBEn97pBt4,337
-accrete/contrib/ui/utils.py,sha256=f660YNavcQQkO6TtpnEBsT2O3KoJk-M5wgBnhnWB1EI,2563
 accrete/contrib/ui/views.py,sha256=5VUbP0jgMcLMv9-3AKxkV315RA0qXuw5PmTRejPc0Yg,1136
 accrete/contrib/ui/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/ui/static/bulma/LICENSE,sha256=--fY7Bi3Lt7RXXnKc9pe756OJY9fGv-D5OmT5pdSJ5w,1080
@@ -168,12 +167,11 @@ accrete/contrib/ui/static/bulma/versions/bulma-no-dark-mode.scss,sha256=1tXoYLlK
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers-prefixed.scss,sha256=NRrD7Euz_mfDI02D92a63M6H4UhArjhWy3g5DIhQr5o,366
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers.scss,sha256=gyRiEug6frpDJEaxZ7VybdApnmNS5R5A9Zn1R0yWLJg,335
 accrete/contrib/ui/static/bulma/versions/bulma-prefixed.scss,sha256=cDhte1VyFupdjYFXpUyQb7wGB8aUKDGYuKluZCY5CtA,133
-accrete/contrib/ui/static/css/accrete.css,sha256=uvPIU2FvJFnFwyvISjhrHVDC1OV9H1MsDU9id4HZiJg,6862
-accrete/contrib/ui/static/css/accrete.css.map,sha256=UFEDkXkiYpwyBsk0N3SVaAx316bMz0SPsGUUibpbfag,3887
-accrete/contrib/ui/static/css/accrete.scss,sha256=ZuIwivXkinl4vPJTTy1J48yYXON5YjLLpUBOgCYgomg,7205
+accrete/contrib/ui/static/css/accrete.css,sha256=C5GVDuOcSiCVczvpvIzGAmpZQ7_VFbU-0Z_CQ_RtDGE,8208
+accrete/contrib/ui/static/css/accrete.css.map,sha256=r0fiRbfcq57rvMPOC3RZvz7DGKiglLzC2fs5Y8-cHGw,4802
+accrete/contrib/ui/static/css/accrete.scss,sha256=lVgtZx6HsInVdV0LVO0JVijoS6wBupi4GiPhRpQvQ4I,8261
 accrete/contrib/ui/static/css/fa.css,sha256=wiz7ZSCn_btzhjKDQBms9Hx4sSeUYsDrTLg7roPstac,102641
 accrete/contrib/ui/static/css/icons.css,sha256=5550KHsaayeEtRaUdf0h7esQhyec-_5ZfecZ_sOC6v0,6334
-accrete/contrib/ui/static/css/.sass-cache/15adf1eed05371361b08787c918a7f18fc15be79/accrete.scssc,sha256=COJYmUzNErZkHzYxo3GVAqn7leI8NHOyD_YSii9XjHU,71246
 accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
 accrete/contrib/ui/static/icons/accrete.svg,sha256=CWHJKIgk3hxL7xIaFSz2j1cK-eF1TroCbjcF58bgOIs,1024
 accrete/contrib/ui/static/js/alpine-3.14.9.js,sha256=tgDjY9mdlURNtUrL-y3v_smueSqpmgkim82geOW1VkM,44758
@@ -197,28 +195,30 @@ accrete/contrib/ui/templates/django/forms/widgets/input.html,sha256=FCLULKMx0eNl
 accrete/contrib/ui/templates/django/forms/widgets/select.html,sha256=uSfDpOQox2mEKDm9LWJ6jg5rCa3jCbHHTcmOadFLlBg,455
 accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoDLVtTOOiWNprrsPriNr712yFxaHyDIo,47
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
-accrete/contrib/ui/templates/ui/content_right.html,sha256=3DQqbjAafaLtWUTGcBTCzObQEII35DVLfWQ6i6KDh6Y,379
+accrete/contrib/ui/templates/ui/content.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/contrib/ui/templates/ui/content_right.html,sha256=aOFjbtXjjlqwmHpGoEpAUz6LtLGSTM6mX_RAO5-aM6k,380
+accrete/contrib/ui/templates/ui/detail.html,sha256=2yVoJ5rsRKCUoId2NC7ds8l5q1z6Nl7VlLA3bSsxXMM,295
 accrete/contrib/ui/templates/ui/favicon.html,sha256=ZSK6qDGV4Cexgt0VA3KOHYN100yZHOFjfOiFZVudWg0,90
 accrete/contrib/ui/templates/ui/form_error.html,sha256=WWqfFWyJ_LCzm5IkxXztn23GFak5wyM2HZcmiZ3Eq9s,417
-accrete/contrib/ui/templates/ui/layout.html,sha256=yDcZYMUdT3ZaqXPC1qg2Lme_dBnBUG2ZzGyrG0V6ces,13174
-accrete/contrib/ui/templates/ui/list.html,sha256=o0YGM2O4SUlFcP5jMwdEOXVTCuEfanvd77yH7OBRRws,2208
-accrete/contrib/ui/templates/ui/list_update.html,sha256=mLQTCgkKfVI5jrgei-Upc1u87iXL0Q63uLzXHPwMyeo,110
-accrete/contrib/ui/templates/ui/message.html,sha256=jhqkPlWtOaPDoclTm4yKwowA7vR-bWbwfjo2b48uJt0,764
-accrete/contrib/ui/templates/ui/modal.html,sha256=2HwmqcUvGqWfKpuKO1EOfr5F1Lcwn7eChbu3XbrxvYg,2233
+accrete/contrib/ui/templates/ui/layout.html,sha256=r3ZylKY2iPK8HwNcRPSzuJ4dfEQKQMGFCu7CBBE9gUg,13674
+accrete/contrib/ui/templates/ui/list.html,sha256=xyEUYwQKcj-65CO5Te8ixQcUoUj_bh4nmN9cpHaO9uM,2437
+accrete/contrib/ui/templates/ui/list_update.html,sha256=uHwdVQFGwDq0wEbZ6jtSnII6G7xLruivIlOX5dVGlz8,274
+accrete/contrib/ui/templates/ui/message.html,sha256=dQnPNkHIrrOzelXCTO8CLWG5ufmxJ8MuWp66YLZbmro,773
+accrete/contrib/ui/templates/ui/modal.html,sha256=3FzvnFVWvwRQ_r1-2qd9N5wYIOh6_oYDDp7uk6XoJPE,3481
 accrete/contrib/ui/templates/ui/oob.html,sha256=lZHIBBYclefbGkKguS1A7vrtOhODJizbSRaGAAHDvG8,267
 accrete/contrib/ui/templates/ui/table.html,sha256=u6JJz1FykuljZiiC2hL83hy8RbMeXcSH8xuU1ji2SHc,3939
-accrete/contrib/ui/templates/ui/table_row_update.html,sha256=_7tKQlCXxczguYQ-6rkZRwukYBswsh3J2cwT4ke_sQM,445
-accrete/contrib/ui/templates/ui/filter/filter.html,sha256=RBYzmgQmgWKjVNrtZo9L98IW23vWLKSDQrZRb88VxrQ,758
+accrete/contrib/ui/templates/ui/table_row_update.html,sha256=Jvt0wlq4btlIRk1RoSv467nT0MUBn7OwC1EbzawDej4,409
+accrete/contrib/ui/templates/ui/filter/filter.html,sha256=GOTXouHH4RSCFsIzg1UPFAcmKaNNxTPmRj5Bx9K1m4o,759
 accrete/contrib/ui/templates/ui/filter/query_input.html,sha256=Qg_41fODXMgL534ohktb0QOxNzAEbaeBzAajJCEK7Pg,2035
 accrete/contrib/ui/templates/ui/filter/query_operator.html,sha256=h4WWLDnse6DK5Rb_0TTb0wqWxhvY_g3qjwx8_eENMuI,569
 accrete/contrib/ui/templates/ui/filter/query_params.html,sha256=wCkyZ9oSK_ivraNiL-UAY_9TflYw5EspnHHm6V6uOzk,9548
-accrete/contrib/ui/templates/ui/filter/query_tags.html,sha256=QSdM5w8UduT89x4S1ttdmzECBBnR-JipKOsf7rBCfL4,1562
-accrete/contrib/ui/templates/ui/templatetags/field.html,sha256=xQGixZBcgRfQVkRDDOcQVvz2blPia_h0sS6Deatgbkc,198
-accrete/contrib/ui/templates/ui/widgets/model_search_select.html,sha256=bk6m38_u_hbudQoXqzGunGUhvHRphVDlfKjkdcB9rEs,2748
-accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=ojj3n6kAAWL-O8-dqGX2nqFWnPpLlbVvAyiZytSuq10,4599
+accrete/contrib/ui/templates/ui/filter/query_tags.html,sha256=ooeIwIwvhT0fG5SMAuLoMquTVUmYf5n50DM-3gC_iAo,1567
+accrete/contrib/ui/templates/ui/templatetags/field.html,sha256=njmCBUBpLQsSu1r740PMXuh5gNfjDxI6Lmo_dm4JTqw,776
+accrete/contrib/ui/templates/ui/widgets/model_search_select.html,sha256=AUlWN2gKhHk_tWP1-KGel5ifaRMTF60MUtgbap7CGQ4,2938
+accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=NV_PWH8-3TqSfJT2l4aN3TOCFyYWxxtCQ9sh6X8gML0,4686
 accrete/contrib/ui/templates/ui/widgets/model_search_select_options.html,sha256=4Wky0XkYWZlIKXTXzGjJkJTX3H9rhjXTY1hYai3Q3TA,242
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/templatetags/ui.py,sha256=_aKZoLwH_AcDszy3a3lehQsTg9zDaNeMmbSnjFK2wpM,4220
+accrete/contrib/ui/templatetags/ui.py,sha256=cWWgzjQKgcxy6uAJZlIJzeP-O3oqFjbrCZrZdnxNUVk,4924
 accrete/contrib/ui/widgets/__init__.py,sha256=W_y10jfu37lygp4frXuKFSGec97gpNbWskG6DMhTKtY,69
 accrete/contrib/ui/widgets/search_select.py,sha256=zKmOt54QsxUobNkDNEA2ut3pPAl8a5DqmEpcfam1l1I,3762
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -230,7 +230,7 @@ accrete/contrib/user/middleware.py,sha256=qblcujwJsthopagyT-hPFq4HsMyGt-VvqZw5TQ
 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=oPiyyO7RnfI48iKCO7O5_HMk2vioNEUDowKRe-Xwzm0,3435
+accrete/contrib/user/views.py,sha256=O59SwLGpgaihCHn-1vNVsbVSrNFx1-n2YQFQYmFlC6E,3460
 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
@@ -246,7 +246,8 @@ accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html,sha256=suPo
 accrete/contrib/user/templates/user/change_email.html,sha256=w9gBnU_O45YchY0EqD9mUK5oeDaD4cN92tHN80QjReA,815
 accrete/contrib/user/templates/user/change_password.html,sha256=1U7cI-xshsy_nhSj3TUqL3tPtYaBF17XFDgJHXXDzIw,1021
 accrete/contrib/user/templates/user/login.html,sha256=SXbxgq3baEch3ksGMsZqIws5heqAtpkdCLAFX3SLhtQ,2669
-accrete/contrib/user/templates/user/user_form.html,sha256=fPbbUnx2URhdW9-by26q3xe3_w23de42Nj25BOC3qrs,2641
+accrete/contrib/user/templates/user/password_forgotten.html,sha256=aoNR9VUhLkDFLIQ3NUA2Oh19bFlro0ZXvcRUdGDNPnc,30
+accrete/contrib/user/templates/user/user_preferences.html,sha256=s-WmVASO0-5R2PY-y_ExS5kl9yOtMQpElVH3nKLqW0g,1646
 accrete/contrib/user_registration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user_registration/admin.py,sha256=kwmGTsg4Hii-lsw9-UaJG7AhQ4k4SPi48GSrtpZ4YR4,119
 accrete/contrib/user_registration/apps.py,sha256=mYu3fuuubfjImeJHk4D_Wd6Edw2r3oUNXGcFbAkhir4,181
@@ -267,14 +268,15 @@ accrete/migrations/0004_rename_accessgroupmember_memberaccessgrouprel_and_more.p
 accrete/migrations/0005_accessgroup_apply_on_alter_member_access_groups_and_more.py,sha256=1ZL_PG2W_5h1x1oGAUALn2Ks0kzbFusHF7XEXE1J9Pg,996
 accrete/migrations/0006_alter_member_user.py,sha256=l1m1uaP1q8yaCqX2cWdzRcL-fe4VLb1SqQmP966weNQ,643
 accrete/migrations/0007_accessgroup_description.py,sha256=T8BX0gSckC_fM_uD6a5-fdD-ucAn54vyY7_8o0tDIXA,429
+accrete/migrations/0008_alter_member_access_groups_and_more.py,sha256=U2VpQJkLsajpL-rvzx-co5V3jYSxMnvkvjSznyVkr34,782
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/utils/__init__.py,sha256=saw9zi2XItJOPbv4fjTXOpl7StNtC803jHhapFcGx08,312
+accrete/utils/__init__.py,sha256=xXpPIImuZFRFIc8Sg8j6-OWOiJZGAtX4iphdXcxAYM0,328
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
-accrete/utils/forms.py,sha256=H8ojiMRrafdj6Jd-86w2SxkaqshKepNHP2_XOXsMmKQ,3758
+accrete/utils/forms.py,sha256=naV4urdfvmpxcx5Vf3Fo72M5Fy8DjGg5-vkysMKptbA,3914
 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.143.dist-info/METADATA,sha256=JfyR1afDladHASbgL-b4Kg1nA6ijfDlOmqEv2qV0qyc,4953
-accrete-0.0.143.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.143.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
-accrete-0.0.143.dist-info/RECORD,,
+accrete/utils/views.py,sha256=mHfcKNDOiq-38LQ6tz9pDPQt-xs03b2qMxwJClprqu8,5022
+accrete-0.0.144.dist-info/METADATA,sha256=cq1cGVRjyQjJ2j6-CAASXQVJvjUIq4VkL2ok6--mcOo,4953
+accrete-0.0.144.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.144.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
+accrete-0.0.144.dist-info/RECORD,,

accrete/contrib/ui/context.py

@@ -1,123 +0,0 @@
-import logging
-import re
-from dataclasses import dataclass, field
-from django.core import paginator
-from django.db.models import QuerySet, Model
-from .filter import Filter
-
-_logger = logging.getLogger(__name__)
-
-
-@dataclass(kw_only=True)
-class BaseContext:
-
-    extra: dict = field(default_factory=dict)
-
-    def __post_init__(self):
-        for key, value in self.extra.items():
-            setattr(self, key, value)
-
-    def dict(self):
-        return {
-            attr: getattr(self, attr, None) for attr
-            in filter(lambda x: not x.startswith('_'), self.__dict__)
-        }
-
-
-@dataclass(kw_only=True)
-class Context(BaseContext):
-
-    title: str = ''
-
-
-@dataclass
-class ListContext(Context):
-
-    page: paginator.Page
-    queryset: QuerySet
-    endless_scroll: bool = True
-    filter: Filter = None
-    column_count: int = 1
-    column_height: int = 150
-    column_height_unit: str = 'px'
-
-    def __post_init__(self):
-        super().__post_init__()
-        if self.column_count not in range(1, 13):
-            _logger.warning(
-                'ListContext parameter column_count should be in range 1 - 12'
-            )
-
-
-@dataclass
-class ListUpdateContext(BaseContext):
-
-    object: Model
-    template: str
-
-
-@dataclass
-class TableContext(Context):
-
-    object_label: str
-    fields: list[str]
-    page: paginator.Page
-    queryset: QuerySet
-    footer: dict = field(default_factory=dict)
-    endless_scroll: bool = True
-    filter: Filter = None
-
-
-@dataclass
-class TableRowContext(BaseContext):
-
-    object: Model
-    fields: list[str]
-    queryset: QuerySet
-    footer: dict = field(default_factory=dict)
-
-
-@dataclass
-class ModalContext(BaseContext):
-
-    title: str
-    modal_id: str
-    blocking: bool = False
-
-    def __post_init__(self):
-        super().__post_init__()
-        self.modal_id = re.sub(r'[^A-Za-z-]+', '', self.modal_id).strip('-')
-
-
-@dataclass(kw_only=True)
-class OobContext(BaseContext):
-
-    template: str
-    id: str = None
-    swap: str = 'true'
-    tag: str = 'div'
-
-    def dict(self) -> dict:
-        res = {
-            attr: getattr(self, attr, None) for attr
-            in filter(
-                lambda x:
-                not x.startswith('_')
-                and x not in ['template', 'id', 'swap', 'tag'],
-                self.__dict__
-            )
-        }
-        res.update({'oob': {
-            'template': self.template,
-            'id': self.id,
-            'swap': self.swap,
-            'tag': self.tag
-        }})
-        return res
-
-
-@dataclass(kw_only=True)
-class MessageContext(BaseContext):
-
-    persistent: bool = False
-    append: bool = False

accrete/contrib/ui/utils.py

@@ -1,88 +0,0 @@
-import ast
-import json
-
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import render
-from django.template.loader import render_to_string
-
-from . import OobContext
-from .context import BaseContext, ModalContext
-from accrete.utils import render_templates
-
-
-def modal_response(
-    request: HttpRequest,
-    template: str,
-    context: ModalContext | dict,
-    update: bool = False
-) -> HttpResponse:
-
-    if isinstance(context, ModalContext):
-        context = context.dict()
-    res = render(request, template, context)
-    if update:
-        res.headers['HX-Retarget'] = f'#{context["modal_id"]}'
-        res.headers['HX-Reswap'] = 'outerHTML'
-        return res
-    res.headers['HX-Retarget'] = 'body'
-    res.headers['HX-Reswap'] = 'beforeend'
-    return res
-
-
-def detail_response(
-    request: HttpRequest,
-    header_template: str = None,
-    content_template: str = None,
-    context: BaseContext | dict = None,
-    extra_content: str | None = None
-) -> HttpResponse:
-    if isinstance(context, BaseContext):
-        context = context.dict()
-    templates = [
-        ('ui/message.html', context)
-    ]
-    if header_template:
-        templates.append(('ui/oob.html', OobContext(
-            template=header_template,
-            swap='innerHTML:#content-right-header',
-            extra=context
-        ).dict()))
-    if content_template:
-        templates.append(('ui/oob.html', OobContext(
-            template=content_template,
-            swap='innerHTML:#content-right',
-            extra=context
-        ).dict()))
-    content = render_templates(templates, request=request)
-    if extra_content:
-        content += extra_content
-    res = HttpResponse(content=content)
-    add_trigger(res, 'activate-content-right')
-    return res
-
-
-def search_select_response(queryset) -> HttpResponse:
-    return HttpResponse(render_to_string(
-        'ui/widgets/model_search_select_options.html',
-        {'options': queryset}
-    ))
-
-
-def add_trigger(
-    response: HttpResponse,
-    trigger: dict | str,
-    header: str = 'HX-Trigger'
-) -> HttpResponse:
-    if isinstance(trigger, str):
-        trigger = {trigger: ''}
-    res_trigger = response.headers.get(header)
-    if not res_trigger:
-        response.headers[header] = json.dumps(trigger)
-        return response
-    try:
-        res_trigger = ast.literal_eval(response.headers.get(header, '{}'))
-    except SyntaxError:
-        res_trigger = {response.headers[header]: ''}
-    res_trigger.update(trigger)
-    response.headers[header] = json.dumps(res_trigger)
-    return response