accrete 0.0.90__tar.gz → 0.0.92__tar.gz

{accrete-0.0.90 → accrete-0.0.92}/PKG-INFO

@@ -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 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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-0.0.90 → accrete-0.0.92}/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 → accrete-0.0.92}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.90'
+version = '0.0.92'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]
@@ -22,7 +22,7 @@ classifiers = [
     'Topic :: Internet :: WWW/HTTP'
 ]
 dependencies = [
-    'django >= 4.2'
+    'django >= 5.1'
 ]
 
 [project.optional-dependencies]