accrete 0.0.90__py3-none-any.whl → 0.0.92__py3-none-any.whl

accrete/annotation.py

@@ -1,4 +1,4 @@
-from django.db.models import Field
+from django.db.models import Field, Subquery, OuterRef
 from django.db.models.expressions import Func
 from django.db.models.aggregates import Aggregate
 
@@ -34,10 +34,13 @@ class AnnotationModelMixin:
 
 class AnnotationManagerMixin:
 
-    def get_annotations(self):
+    def get_annotations(self, queryset):
         if not hasattr(self.model, 'get_annotations'):
             return {}
         return {
-            annotation['name']: annotation['annotation'].function
+            annotation['name']: Subquery(
+                queryset.annotate(**{
+                    annotation['name']: annotation['annotation'].function
+                }).filter(pk=OuterRef('pk')).values(annotation['name'])[:1])
             for annotation in self.model.get_annotations()
         }

accrete/contrib/ui/static/css/accrete.css

@@ -20636,7 +20636,7 @@ td {
   background-color: var(--accrete-field-bg-color);
 }
 
-.label.has-field * .button {
+.label.has-field * .button:not(.label-button) {
   border-top: transparent;
   border-right: transparent;
   border-left: transparent;

accrete/contrib/ui/static/css/accrete.scss

@@ -123,7 +123,7 @@ td {
     background-color: var(--accrete-field-bg-color);
 }
 
-.label.has-field * .button {
+.label.has-field * .button:not(.label-button) {
     border-top: transparent;
     border-right: transparent;
     border-left: transparent;

accrete/contrib/ui/templates/ui/layout.html

@@ -11,7 +11,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     {% block favicon %}<link rel="icon" type="image/svg" href="{% static 'icons/accrete.svg' %}"/>{% endblock %}
     {% block style %}
-        <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}?v=0.0.89">
+        <link rel="stylesheet" type="text/css" href="{% static "css/accrete.css" %}?v=0.0.91">
         <link rel="stylesheet" type="text/css" href="{% static "css/icons.css" %}">
         <link rel="stylesheet" type="text/css" href="{% static "css/fa.css" %}">
     {% endblock %}

accrete/contrib/ui/templates/ui/list.html

@@ -7,7 +7,7 @@
 {% block content %}
     <div class="columns is-multiline">
         {% for obj in list_page %}
-            <div class="list-column column is-{{ column_width }}-fullhd is-{{ column_width_widescreen }}-widescreen is-{{ column_width_desktop }}-desktop is-12-touch"
+            <div class="list-column column pb-0 is-{{ column_width }}-fullhd is-{{ column_width_widescreen }}-widescreen is-{{ column_width_desktop }}-desktop is-12-touch"
                  style="height: {{ column_height }}{{ column_height_unit }}"
                  {% if endless_scroll and forloop.last and list_page.has_next %}
                     hx-get="{{ pagination_param_str }}&page={{ list_page.next_page_number }}"
@@ -19,7 +19,7 @@
                 {% endif %}
             >
                 <div class="box is-hoverable p-3" 
-                     style="word-break: break-word; height: 100%; border: var(--accrete-box-border); overflow-y: auto; {% if obj.get_absolute_url %}cursor:pointer;{% endif %}"
+                     style="word-break: break-word; height: 100%; border: var(--accrete-box-border); overflow-y: auto; {% if obj.get_absolute_url %}cursor:pointer;{% endif %}" 
                      {% if obj.get_absolute_url %}hx-get="{{ obj.get_absolute_url }}{{ object_param_str }}" hx-target="body" hx-push-url="true" {% endif %}
                 >
                     {% block data %}

accrete/managers.py

@@ -9,7 +9,7 @@ class TenantManager(models.Manager, AnnotationManagerMixin):
         queryset = super().get_queryset()
         if tenant := get_tenant():
             queryset = queryset.filter(tenant=tenant)
-        return queryset.annotate(**self.get_annotations())
+        return queryset.annotate(**self.get_annotations(queryset))
 
     def bulk_create(
             self,

accrete/models.py

@@ -21,7 +21,12 @@ class TenantModel(models.Model, AnnotationModelMixin):
     objects = TenantManager()
 
     def save(
-        self, force_insert=False, force_update=False, using=None, update_fields=None
+        self,
+        *args,
+        force_insert=False,
+        force_update=False,
+        using=None,
+        update_fields=None
     ):
         tenant = get_tenant()
         if self.pk and tenant and self.tenant != tenant:

{accrete-0.0.90.dist-info → accrete-0.0.92.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.90
+Version: 0.0.92
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 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>=4.2
+Requires-Dist: django>=5.1
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
 Requires-Dist: django-celery-beat; extra == 'contrib'

{accrete-0.0.90.dist-info → accrete-0.0.92.dist-info}/RECORD

@@ -1,12 +1,12 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
-accrete/annotation.py,sha256=P85kNgf_ka3U8i5cwaiKaAiSm21U-xY9PKmXMZR2ulU,1160
+accrete/annotation.py,sha256=GCpTTX3fJH9w2vOOOydKcAALdEd1gRNjh_Ws9LkJ4aA,1355
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
-accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
+accrete/managers.py,sha256=vODaKmWPvgfRoYXbQ_JD-pRjd2QWM_a9Gjkllrua0WE,1164
 accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
-accrete/models.py,sha256=svE5NCB-YRwZetsU2PlVGrkfxFvaA-ZmQU0-19GxOP0,5387
+accrete/models.py,sha256=xliEVR0XPW46ZDJn3-F46s54tG9dxz7BVLbkq1pC144,5434
 accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
@@ -145,9 +145,9 @@ accrete/contrib/ui/static/bulma/versions/bulma-no-dark-mode.scss,sha256=w6Q80mCV
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers-prefixed.scss,sha256=6HCUc4hxyaj4_rHqUnoy7aMuFZECHDYh5jvp-1CEtfE,344
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers.scss,sha256=5dzAXSgReWUO8GXLbYTpOclPPD0xqvvBiCCX_GOR_5U,313
 accrete/contrib/ui/static/bulma/versions/bulma-prefixed.scss,sha256=Yj7oEO00jy_G_L32y6rwzp2P5p2YtQ2Pvq4aZhvBSE8,138
-accrete/contrib/ui/static/css/accrete.css,sha256=Qhh4sQNVynoaFE3_TMDwlg_zBWRvyO7baSxnodVB7Is,606610
+accrete/contrib/ui/static/css/accrete.css,sha256=BxRjOCczt1i0mAvqWMeRZkm0uzyRHxzCDsYHOpl4aYU,606629
 accrete/contrib/ui/static/css/accrete.css.map,sha256=2OtQtNJXftZNePoK3IDrLhD3QbVkzMY6q9DKHXssT0Q,94573
-accrete/contrib/ui/static/css/accrete.scss,sha256=Y6rbMIEme5d4b9bsNCQ9E-aZ_RRVpVEyUWFA9R77o3Q,12053
+accrete/contrib/ui/static/css/accrete.scss,sha256=kLtGfEySI5EFo1xqIP26tFXxWkMLmlA3J3SdO4E-5Kw,12072
 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/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
@@ -175,8 +175,8 @@ accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3
 accrete/contrib/ui/templates/ui/dashboard.html,sha256=udnwiSJEcn2wMaJfTs4P0Y20FU79VguK_9Lq4K2BqtM,160
 accrete/contrib/ui/templates/ui/detail.html,sha256=-Nksyufbf4onufqmFGTAW_BxLRNSWv1A9n8Qs2a6aCo,564
 accrete/contrib/ui/templates/ui/form.html,sha256=uCtP16THdOuRfs3JdsjadIW0k9b2rN3GAsRSTfSUWak,691
-accrete/contrib/ui/templates/ui/layout.html,sha256=of-8_hvH67fna2DLOeHq-qezfx21eZIC_XC0YF8FNIs,15649
-accrete/contrib/ui/templates/ui/list.html,sha256=ZmZtZIkU1lB6CQtTzwrwrmz4IGOsQDm2hSqpL_FqauE,1745
+accrete/contrib/ui/templates/ui/layout.html,sha256=0exf4WLB9Ns9KvP3q5GZRtwf4yzIOQZmYTTj1AAv_Xo,15649
+accrete/contrib/ui/templates/ui/list.html,sha256=ahN8SgF4kE3OEy6EBeDBdDQvuXx-CyIgbixYd-KdV4k,1751
 accrete/contrib/ui/templates/ui/table.html,sha256=8ELtgxoapCyNsvmGISAGXe712lG6AkP_nekb4OVLK3I,4481
 accrete/contrib/ui/templates/ui/partials/filter.html,sha256=2vmeL3980rMmkRnmVtZh9mBHe6S0PTMjaGIN1J6SpNM,7184
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=C5ktasYff2xBTiWfM6QR8qaGKSyK9QufB3B9N77KGpg,1386
@@ -232,7 +232,7 @@ accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
 accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
 accrete/utils/http.py,sha256=sUDwa9hpYAle7d0iJxIA5wQk2mK2BMENo7JyFBSPxKc,4475
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.90.dist-info/METADATA,sha256=eUyxgfaMCT0SLIiK2_uX0fs8jThi3i_is6UT1Drj7Tw,4952
-accrete-0.0.90.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.90.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.90.dist-info/RECORD,,
+accrete-0.0.92.dist-info/METADATA,sha256=qQWTwFVcTYzWGNz5a5Zl4IRkzL8oZRiLywbh4ueADSc,4952
+accrete-0.0.92.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.92.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.92.dist-info/RECORD,,