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

accrete/contrib/ui/response.py

@@ -141,8 +141,8 @@ class ListEntryResponse(Response):
         instance: Model,
         list_entry_template: str,
         context: dict = None,
-        page: paginator.Page,
-        is_new: bool,
+        page: paginator.Page = None,
+        is_new: bool = False,
         column_count: int = 1,
         column_height: str = '150px',
     ):
@@ -309,193 +309,6 @@ class TriggerResponse:
         return res
 
 
-# @dataclass(kw_only=True)
-# class Response:
-#
-#     template: str
-#     context: dict = field(default_factory=dict)
-#
-#     base_template = None
-#
-#     def __post_init__(self):
-#         for key, value in self.context.items():
-#             setattr(self, key, value)
-#         if self.base_template is None:
-#             self.base_template = self.template
-#
-#     def dict(self):
-#         return {
-#             attr: getattr(self, attr, None) for attr
-#             in filter(lambda x: not x.startswith('_'), self.__dict__)
-#         }
-#
-#     @staticmethod
-#     def add_trigger(response):
-#         pass
-#
-#     def render(self, request) -> str:
-#         return render_to_string(
-#             template_name=self.base_template, context=self.dict(), request=request
-#         )
-#
-#     def response(self, request, extra_content: str = None) -> HttpResponse:
-#         extra_content = extra_content or ''
-#         res = HttpResponse(content=(
-#             self.render(request)
-#             + render_to_string('ui/message.html', self.dict(), request)
-#             + extra_content
-#         ))
-#         self.add_trigger(res)
-#         return res
-#
-#
-# @dataclass(kw_only=True)
-# class OobResponse(Response):
-#
-#     swap: str
-#     tag: str = 'div'
-#     id: str = None
-#
-#     base_template = 'ui/oob.html'
-#
-#     def dict(self) -> dict:
-#         attributes = filter(
-#             lambda x: not x.startswith('_') and x not in ['template', 'swap', 'tag'],
-#             self.__dict__
-#         )
-#         res = {attr: getattr(self, attr, None) for attr in attributes}
-#         res.update({'oob': {
-#             'template': self.template,
-#             'id': self.id,
-#             'swap': self.swap,
-#             'tag': self.tag
-#         }})
-#         return res
-#
-#     # def render(self, request) -> str:
-#     #     return render_to_string(
-#     #         template_name='ui/oob.html', context=self.dict(), request=request
-#     #     )
-#
-#
-# @dataclass(kw_only=True)
-# class WindowResponse(Response):
-#
-#     title: str = ''
-#     panel_template: str = None
-#     overview_header_template: str = None
-#     overview_data_template: str = None
-#
-#     base_template = 'ui/layout.html'
-#
-#     def __post_init__(self):
-#         if 'has_panel' not in self.context.keys():
-#             self.context.update(has_panel=self._has_panel())
-#         super().__post_init__()
-#         if self.template:
-#             self.base_template = self.template
-#
-#     def _has_panel(self) -> bool:
-#         return bool(self.panel_template)
-#
-#
-# @dataclass(kw_only=True)
-# class PageResponse(WindowResponse):
-#
-#     page: paginator.Page = None
-#     ui_filter: Filter = None
-#     endless_scroll: bool = True
-#
-#     def __post_init__(self):
-#         assert self.page is not None or self.ui_filter is not None, _(
-#             'Argument page or ui_filter must be supplied'
-#         )
-#         if self.ui_filter and not self.page:
-#             self.page = self.ui_filter.get_page()
-#         super().__post_init__()
-#
-#     def _has_panel(self) -> bool:
-#         return bool(self.panel_template or self.ui_filter)
-#
-#
-# @dataclass(kw_only=True)
-# class ListResponse(PageResponse):
-#
-#     list_entry_template: str = None
-#     column_count: int = 1
-#     column_height: str = '150px'
-#     overview_data_template:str = 'ui/list.html'
-#
-#
-# @dataclass(kw_only=True)
-# class ListEntryResponse(Response):
-#
-#     object: Model
-#     list_entry_template: str
-#     page: paginator.Page = None
-#     new_entry: bool = False
-#     template: str = 'ui/list_update.html'
-#
-#     def render(self, request) -> str:
-#         res = super().render(request)
-#         if self.page:
-#             pagination_update = OobResponse(
-#                 template='ui/layout.html#pagination',
-#                 swap='innerHTML:#pagination',
-#                 context=dict(page=self.page)
-#             ).render(request)
-#             res += pagination_update
-#         return res
-#
-#
-# @dataclass(kw_only=True)
-# class TableResponse(PageResponse):
-#
-#     object_label: str
-#     fields: list[str]
-#     footer: dict = field(default_factory=dict)
-#     template = 'ui/table.html'
-#
-#
-# @dataclass(kw_only=True)
-# class TableRowResponse(Response):
-#
-#     object: Model
-#     fields: list[str]
-#     footer: dict = field(default_factory=dict)
-#     page: paginator.Page = None
-#
-#     base_template = 'ui/table_row_update.html'
-#
-#
-# @dataclass(kw_only=True)
-# class DetailResponse(Response):
-#
-#     detail_data_template: str = None
-#     detail_header_template: str = None
-#
-#     base_template = 'ui/detail.html'
-#
-#     @staticmethod
-#     def add_trigger(response):
-#         add_trigger(response, 'activate-detail')
-#
-#
-# @dataclass(kw_only=True)
-# class ModalResponse(Response):
-#
-#     title: str
-#     modal_id: str
-#     template: str
-#     modal_update: bool = False
-#     blocking: bool = False
-#     modal_width: str = None
-#
-#     def __post_init__(self):
-#         super().__post_init__()
-#         self.modal_id = re.sub(r'[^A-Za-z-]+', '', self.modal_id).strip('-')
-
-
 def search_select_response(queryset) -> HttpResponse:
     return HttpResponse(render_to_string(
         'ui/widgets/model_search_select_options.html',

accrete/contrib/ui/templates/ui/detail.html

@@ -1,5 +1,5 @@
 {% if detail_header_template %}
-    <div hx-select-oob="innerHTML:#detail-header">
+    <div hx-swap-oob="innerHTML:#detail-header">
         {% include detail_header_template %}
     </div>
 {% endif %}

accrete/contrib/ui/templates/ui/list_update.html

@@ -3,7 +3,7 @@
         {% include 'ui/list.html#entry' %}
     </div>
 {% else %}
-    <div hx-swap-oob="innerHTML:#list-data-{{ object.pk }}">
+    <div hx-swap-oob="innerHTML:#list-data-{{ instance.pk }}">
         {% include list_entry_template with instance=instance %}
     </div>
 {% endif %}

accrete/contrib/user/templates/user/change_email.html

@@ -1,19 +1,12 @@
 {% extends 'ui/modal.html' %}
 {% load i18n %}
+{% load ui %}
 
 {% block modal_content %}
     <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_email' %}">
         {% csrf_token %}
-        <label class="label has-field is-required">
-            {{ form.email.label }}
-            {{ form.email }}
-            <span class="has-text-danger is-size-7">{{ form.email.errors }}</span>
-        </label>
-        <label class="label has-field is-required">
-            {{ form.password.label }}
-            {{ form.password }}
-            <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
-        </label>
+        {{ form.email|wrap_label }}
+        {{ form.password|wrap_label }}
     </form>
 {% endblock %}
 

accrete/contrib/user/templates/user/change_password.html

@@ -1,24 +1,13 @@
 {% extends 'ui/modal.html' %}
 {% load i18n %}
+{% load ui %}
 
 {% block modal_content %}
     <form id="{{ modal_id }}-form" hx-post="{% url 'user:change_password' %}">
-    {% csrf_token %}
-    <label class="label">
-        {{ form.old_password.label }}
-        {{ form.old_password }}
-        <span class="has-text-danger is-size-7">{{ form.old_password.errors }}</span>
-    </label>
-    <label class="label has-field is-required">
-        {{ form.new_password.label }}
-        {{ form.new_password }}
-        <span class="has-text-danger is-size-7">{{ form.new_password.errors }}</span>
-    </label>
-    <label class="label has-field is-required">
-        {{ form.new_password_confirm.label }}
-        {{ form.new_password_confirm }}
-        <span class="has-text-danger is-size-7">{{ form.new_password_confirm.errors }}</span>
-    </label>
+        {% csrf_token %}
+        {{ form.old_password|wrap_label }}
+        {{ form.new_password|wrap_label }}
+        {{ form.new_password_confirm|wrap_label }}
 </form>
 {% endblock %}
 

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

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

{accrete-0.0.144.dist-info → accrete-0.0.146.dist-info}/RECORD

@@ -66,7 +66,7 @@ accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,15
 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/response.py,sha256=QwCxuPrzPLcJHOnZHfy0GcqqRWzZIu5kiInFxLE6VYg,10423
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=5XUfK85HYWYf7oopMoJEEYmQ6pNgHgZBErBEn97pBt4,337
 accrete/contrib/ui/views.py,sha256=5VUbP0jgMcLMv9-3AKxkV315RA0qXuw5PmTRejPc0Yg,1136
@@ -197,12 +197,12 @@ accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoD
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
 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/detail.html,sha256=V0HccLE0Pb-5haQFpvIoWZfF1UOrvMwPYv2UTwRnt_A,293
 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=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/list_update.html,sha256=CUV-OJCieOBrtSbh0vAoyZYL-_e9lP7vQrY4j1TlT7M,276
 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
@@ -243,8 +243,8 @@ accrete/contrib/user/migrations/0007_user_managed_login.py,sha256=SfG1Yj9m_g-sZb
 accrete/contrib/user/migrations/0008_remove_user_no_email_for_managed_user_and_more.py,sha256=XypG6tN0WmLyJV8sbZgSVqNFbTxRsBHWhIRyMJGfV7c,655
 accrete/contrib/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html,sha256=suPoeu1Dm49rDCrhnrkSZY8cBDsovnKqKGXcS5q-7o0,334
-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/change_email.html,sha256=C53Ow_J80nycjbfrUrvETdd2-J4ZJnbHAjGKk1N2zUo,463
+accrete/contrib/user/templates/user/change_password.html,sha256=pOc4C0J-rY7Nr0ltMGT-DpKdsVBOvEWqj1UBa_kTYVw,523
 accrete/contrib/user/templates/user/login.html,sha256=SXbxgq3baEch3ksGMsZqIws5heqAtpkdCLAFX3SLhtQ,2669
 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
@@ -276,7 +276,7 @@ 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=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-0.0.146.dist-info/METADATA,sha256=fFoFLZA3KrYwNZnCox5GJUegFEFKcrqpVg8BpMSbOzg,4953
+accrete-0.0.146.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.146.dist-info/licenses/LICENSE,sha256=vHwb4Qnv8UfYKFiCWyTuRGsi49x19UQwHRCky3b2_NE,1057
+accrete-0.0.146.dist-info/RECORD,,