accrete 0.0.77__py3-none-any.whl → 0.0.79__py3-none-any.whl

accrete/contrib/ui/__init__.py

@@ -6,6 +6,7 @@ from .context import (
     ListContext,
     FormContext,
     ModalFormContext,
+    ModalContext,
     form_actions,
     list_page,
     detail_page,

accrete/contrib/ui/context.py

@@ -1,6 +1,7 @@
 import logging
 import json
 from urllib.parse import quote_plus
+from uuid import uuid4
 from dataclasses import dataclass, field
 from functools import partial
 from typing import Type, TypedDict, Callable
@@ -196,6 +197,19 @@ class ModalFormContext(BaseContext):
     blocking: bool = True
 
 
+@dataclass
+class ModalContext(BaseContext):
+
+    title: str
+    blocking: bool = False
+    modal_id: str = None
+
+    def __post_init__(self):
+        super().__post_init__()
+        if not self.modal_id:
+            self.modal_id = f'modal{str(uuid4())[:8]}'
+
+
 def cast_param(params: dict, param: str, cast_to: Callable, default):
     if param not in params:
         return default

accrete/contrib/ui/templates/ui/partials/modal.html

@@ -0,0 +1,34 @@
+{% load i18n %}
+
+<div x-data="" x-ref="modal" class="modal is-active"
+     {% if blocking %}
+        hx-indicator="#{{ modal_id }}-indicator"
+        hx-disabled-elt="#{{ modal_id }}-background"
+     {% endif %}
+>
+    <button id="{{ modal_id }}-background" class="modal-background" @click="$refs.modal.remove()" style="cursor: default"></button>
+    <div class="modal-card">
+        <header class="modal-card-head">
+            <p class="modal-card-title">
+                {{ title }}
+            </p>
+            <button class="delete filter-modal-close" aria-label="close" @click="$refs.modal.remove()"></button>
+        </header>
+        <section class="modal-card-body">
+            {% block modal_content %}{% endblock %}
+        </section>
+        <footer class="modal-card-foot">
+            {% block modal_footer %}
+                <div class="buttons" style="width: 100%">
+                    {% block modal_buttons %}
+                    {% endblock %}
+                </div>
+            {% endblock %}
+        </footer>
+        {% if blocking %}
+            <div id="{{ modal_id }}-indicator" class="htmx-indicator modal-request-overlay" style="position: absolute; inset: 0; background: rgba(47, 47, 62, 0.2)">
+                <progress class="progress is-success" max="100" style="position: absolute; inset: 0; width: 50%; margin-top: 25%; margin-left: 25%"></progress>
+            </div>
+        {% endif %}
+    </div>
+</div>

accrete/contrib/ui/templates/ui/partials/modal_form.html

@@ -36,8 +36,10 @@
                 </div>
             {% endblock %}
         </footer>
-    <div id="modal-{{ form_id }}-indicator" class="htmx-indicator modal-request-overlay" style="position: absolute; inset: 0; background: rgba(47, 47, 62, 0.2)">
-        <progress class="progress is-success" max="100" style="position: absolute; inset: 0; width: 50%; margin-top: 25%; margin-left: 25%"></progress>
-    </div>
+        {% if blocking %}
+            <div id="modal-{{ form_id }}-indicator" class="htmx-indicator modal-request-overlay" style="position: absolute; inset: 0; background: rgba(47, 47, 62, 0.2)">
+                <progress class="progress is-success" max="100" style="position: absolute; inset: 0; width: 50%; margin-top: 25%; margin-left: 25%"></progress>
+            </div>
+        {% endif %}
     </div>
 </div>

accrete/models.py

@@ -25,9 +25,9 @@ class TenantModel(models.Model, AnnotationModelMixin):
     ):
 
         tenant = get_tenant()
-        if tenant is not None and self.tenant != tenant:
+        if self.pk and tenant is not None and self.tenant != tenant:
             raise ValueError('Current tenant differs from tenant of the record!')
-        self.tenant = self.tenant or tenant
+        self.tenant = tenant
         super().save(
             force_insert=force_insert,
             force_update=force_update,

{accrete-0.0.77.dist-info → accrete-0.0.79.dist-info}/METADATA

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

{accrete-0.0.77.dist-info → accrete-0.0.79.dist-info}/RECORD

@@ -6,7 +6,7 @@ accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
 accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
 accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
-accrete/models.py,sha256=grvRNXg0ZYAJU3KAIX-svuZXeXlfqP4qEJ00nlbV594,5145
+accrete/models.py,sha256=fiTeM7oaKz38u9egTRtWuexMhzcKhqKbaIFh6A6Jz3w,5142
 accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
@@ -34,10 +34,10 @@ accrete/contrib/system_mail/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2
 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=jU-3gQtEwtac-NPxFYCEoYF58WmCEanedXah4lETkWU,552
+accrete/contrib/ui/__init__.py,sha256=RiJ8hNHSpkVfT_fpwP_3XXnNo9q5E-7G59xMC6PsrWE,570
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/context.py,sha256=HZNKf_O71FxbH4kYXw-wUVQmUTkmCB19i6VyJL0FF3Q,10100
+accrete/contrib/ui/context.py,sha256=qoGYYxkC1RTw3eCf3l-CJV7NUnNTn5-DDV46ObzocH8,10384
 accrete/contrib/ui/elements.py,sha256=rwXhRitKt70-ZT4yiLXvB7cp8jQbr02L7JpYwUy5jv4,1941
 accrete/contrib/ui/filter.py,sha256=UAIkUNKu2nVQLafwZlkQu4PDfOPyFM61e_mE7OWRhYs,12410
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
@@ -171,7 +171,8 @@ accrete/contrib/ui/templates/ui/table.html,sha256=8ELtgxoapCyNsvmGISAGXe712lG6Ak
 accrete/contrib/ui/templates/ui/partials/filter.html,sha256=2vmeL3980rMmkRnmVtZh9mBHe6S0PTMjaGIN1J6SpNM,7184
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=C5ktasYff2xBTiWfM6QR8qaGKSyK9QufB3B9N77KGpg,1386
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=F-ffQGuqmL4ahhjW_tj9rCgrtqi1L-_KLRCs1ASmb90,6993
-accrete/contrib/ui/templates/ui/partials/modal_form.html,sha256=XCeKjhvIi-vGl9wbFT-eBuFgKNOdKrG9mrVA95lBMkg,2033
+accrete/contrib/ui/templates/ui/partials/modal.html,sha256=0vfR0LSfvOo2oOFSGeJyLkmjpXbYV1tpAcvdkyHQGyQ,1438
+accrete/contrib/ui/templates/ui/partials/modal_form.html,sha256=5P1n4ykVYvIYOO84VRwoOPR_jqXakmH51i8WyeMm-QQ,2103
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=8wNgZYnpa6ttc-OraOi1i02isJCcnaMtYwsmObc3qcY,109
 accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=58nA3X7Il0FAD4VcYyr7tTGWRiVf_FN1TkImmKEpKHU,1014
 accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=Eyx1lsk9UIFFYPICL7RuYeUFaKVlmvWVXnFCGR-II7k,1324
@@ -221,7 +222,7 @@ accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
 accrete/utils/forms.py,sha256=Lll-DvAhKZDw72XeuCtb4wxQEJNFp7lQWh_Z1GyH3Zk,3049
 accrete/utils/http.py,sha256=mAtQRgADv7zu1_j7A-EKVyb-oqa5a21i4Gd0QfjzGV0,3540
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.77.dist-info/METADATA,sha256=5WK5qeJEnQ6axXO7JkKbCbSWpyURJ5kTfoLkVE_72M0,4892
-accrete-0.0.77.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.77.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.77.dist-info/RECORD,,
+accrete-0.0.79.dist-info/METADATA,sha256=fv0cU9skKtwsZhPP5OZpbiYUvHKv__C3J4TsHAPVJ1A,4892
+accrete-0.0.79.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.79.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.79.dist-info/RECORD,,