accrete 0.0.129__tar.gz → 0.0.131__tar.gz

{accrete-0.0.129 → accrete-0.0.131}/PKG-INFO

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

{accrete-0.0.129 → accrete-0.0.131}/accrete/contrib/ui/__init__.py

@@ -8,3 +8,4 @@ from . context import (
     TableRowContext,
     ModalContext
 )
+from .utils import update_modal

{accrete-0.0.129 → accrete-0.0.131}/accrete/contrib/ui/templates/ui/layout.html

@@ -147,6 +147,9 @@
                                             <div class="mr-2">
                                                 <p class="title is-5 px-2 py-1 my-1">{{ title }}</p>
                                             </div>
+                                            <div class="buttons">
+                                                {% block header_left_buttons %}{% endblock %}
+                                            </div>
                                         {% endblock %}
                                     </div>
                                     {% if page %}

{accrete-0.0.129 → accrete-0.0.131}/accrete/contrib/ui/templates/ui/list.html

@@ -3,10 +3,6 @@
 {% load ui %}
 {% load partials %}
 
-{% block header_left %}
-    {{ block.super }}
-{% endblock %}
-
 {% block content_left %}
     <div class="fixed-grid has-{{ column_count }}-cols has-1-cols-mobile m-2">
         <div id="list-grid" class="grid m-0">

accrete-0.0.131/accrete/contrib/ui/utils.py

@@ -0,0 +1,17 @@
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import render
+from .context import ModalContext
+
+
+def update_modal(
+    request: HttpRequest,
+    template: str,
+    context: ModalContext | dict
+) -> HttpResponse:
+
+    if isinstance(context, ModalContext):
+        context = context.dict()
+    res = render(request, template, context)
+    res.headers['HX-Retarget'] = f'#{context["modal_id"]}'
+    res.headers['HX-Reswap'] = 'outerHTML'
+    return res

{accrete-0.0.129 → accrete-0.0.131}/accrete/contrib/user/templates/user/user_form.html

@@ -1,12 +1,11 @@
 {% extends 'ui/layout.html' %}
 {% load i18n %}
 
-{% block header_left %}
-    {{ block.super }}
-    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_password' %}" hx-target="body" hx-swap="beforeend">
+{% block header_left_buttons %}
+    <button class="button is-light" hx-get="{% url 'user:change_password' %}" hx-target="body" hx-swap="beforeend">
         <span>{% translate 'Change Password' %}</span>
     </button>
-    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_email' %}" hx-target="body" hx-swap="beforeend">
+    <button class="button is-light" hx-get="{% url 'user:change_email' %}" hx-target="body" hx-swap="beforeend">
         <span>{% translate 'Change E-Mail' %}</span>
     </button>
 {% endblock %}

{accrete-0.0.129 → accrete-0.0.131}/accrete/contrib/user/views.py

@@ -77,10 +77,7 @@ def user_change_password(request):
                 + f'?{request.GET.urlencode()}'
             )
         ctx.update(form=form)
-        res = render(request, 'user/change_password.html', ctx)
-        res.headers['HX-Retarget'] = f'#{ctx["modal_id"]}'
-        res.headers['HX-Reswap'] = 'outerHTML'
-        return res
+        return ui.update_modal(request, 'user/change_password.html', ctx)
     return render(request, 'user/change_password.html', ctx)
 
 
@@ -101,8 +98,5 @@ def user_change_email(request):
         if form.is_saved:
             return redirect('user:detail')
         ctx.update(form=form)
-        res = render(request, 'user/change_email.html', ctx)
-        res.headers['HX-Retarget'] = f'#{ctx["modal_id"]}'
-        res.headers['HX-Reswap'] = 'outerHTML'
-        return res
+        return ui.update_modal(request, 'user/change_email.html', ctx)
     return render(request, 'user/change_email.html', ctx)

{accrete-0.0.129 → accrete-0.0.131}/pyproject.toml

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