accrete 0.0.42__tar.gz → 0.0.44__tar.gz

{accrete-0.0.42 → accrete-0.0.44}/PKG-INFO

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

{accrete-0.0.42 → accrete-0.0.44}/accrete/contrib/ui/__init__.py

@@ -1,5 +1,6 @@
 from .filter import Filter
 from .context import (
+    Context,
     DetailContext,
     TableContext,
     ListContext,

{accrete-0.0.42 → accrete-0.0.44}/accrete/contrib/ui/context.py

@@ -1,7 +1,7 @@
 import logging
 from urllib.parse import quote_plus
 from dataclasses import dataclass, field
-from typing import TypedDict
+from typing import TypedDict, Callable
 from django.utils.translation import gettext_lazy as _t
 from django.db import models
 from django.db.models import Model, QuerySet
@@ -80,26 +80,22 @@ class ListContext(Context):
             )
 
 
-class DetailContext(TypedDict, total=False):
+@dataclass
+class DetailContext(Context):
 
-    title: str
     object: Model
-    breadcrumbs: list[BreadCrumb]
-    detail_page: DetailPagination
-    pagination_param_str: str
-    actions: list[ClientAction]
+    detail_page: DetailPagination = None
+    pagination_param_str: str = ''
 
 
-class FormContext(TypedDict, total=False):
+@dataclass
+class FormContext(Context):
 
-    title: str
-    breadcrumbs: list[BreadCrumb]
     form: Form | ModelForm
     form_id: str
-    actions: list[ClientAction]
 
 
-def cast_param(params: dict, param: str, cast_to: callable, default):
+def cast_param(params: dict, param: str, cast_to: Callable, default):
     if param not in params:
         return default
     try:
@@ -110,7 +106,10 @@ def cast_param(params: dict, param: str, cast_to: callable, default):
 
 
 def url_param_dict(get_params: dict) -> dict:
-    return {key: f'&{key}={quote_plus(value)}' for key, value in get_params.items()}
+    return {
+        key: f'&{key}={quote_plus(value)}'
+        for key, value in get_params.items()
+    }
 
 
 def url_param_str(params: dict, extract: list[str] = None) -> str:
@@ -138,9 +137,13 @@ def exclude_params(params: dict, keys: list[str]) -> dict:
     return {key: val for key, val in params.items() if key not in keys}
 
 
-def list_page(queryset: QuerySet, paginate_by: int, page_number: int) -> paginator.Page:
+def list_page(
+        queryset: QuerySet, paginate_by: int, page_number: int
+) -> paginator.Page:
     pages = Paginator(queryset, per_page=paginate_by)
-    return pages.page(page_number <= pages.num_pages and page_number or pages.num_pages)
+    return pages.page(
+        page_number <= pages.num_pages and page_number or pages.num_pages
+    )
 
 
 def detail_page(queryset: QuerySet, obj: Model) -> dict:

{accrete-0.0.42 → accrete-0.0.44}/accrete/contrib/ui/templatetags/accrete_ui.py

@@ -24,7 +24,7 @@ def combine_templates(template_name, request=None):
             )
         except template.TemplateDoesNotExist:
             continue
-    cache.set(template_name, html, 60 * 15)
+    cache.set(template_name, html, None)
     return mark_safe(html)
 
 

{accrete-0.0.42 → accrete-0.0.44}/accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html

@@ -6,8 +6,6 @@
     <a class="navbar-item" href="/admin/">Admin</a>
 {% endif %}
 <hr class="navbar-divider">
-<form id="logout-form" method="post" action="{% url 'user:logout' %}">
-  {% csrf_token %}
-  <a class="navbar-item" href="#" onclick="document.getElementById('logout-form').submit()">{% translate "Log out" %}</a>
-</form>
+<a class="navbar-item" hx-post="{% url 'user:logout' %}">{% translate "Log out" %}</a>
+
 

{accrete-0.0.42 → accrete-0.0.44}/accrete/contrib/user/views.py

@@ -45,7 +45,7 @@ def user_detail(request):
             ui.ClientAction(_('Change E-Mail'), url=reverse('user:edit_email')),
             ui.ClientAction(_('Change Password'), url=reverse('user:edit_password'))
         ]
-    )
+    ).dict()
     return render(request, 'user/user_detail.html', ctx)
 
 
@@ -64,7 +64,7 @@ def user_edit(request):
         form=form,
         form_id='form',
         actions=ui.form_actions(reverse('user:detail'))
-    )
+    ).dict()
     return render(request, 'user/user_form.html', ctx)
 
 
@@ -86,7 +86,7 @@ def user_change_password(request):
         form=form,
         form_id='form',
         actions=ui.form_actions(reverse('user:detail'))
-    )
+    ).dict()
     return render(request, 'user/change_password.html', ctx)
 
 
@@ -108,5 +108,5 @@ def user_change_email(request):
         form=form,
         form_id='form',
         actions=ui.form_actions(reverse('user:detail'))
-    )
+    ).dict()
     return render(request, 'user/change_email.html', ctx)

{accrete-0.0.42 → accrete-0.0.44}/pyproject.toml

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