accrete 0.0.95__py3-none-any.whl → 0.0.97__py3-none-any.whl

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

@@ -71,17 +71,19 @@
                         </button>
                     </div>
                 {% endif %}
-                <div class="control is-expanded">
-                    <button id="list-customization-order-trigger"
-                            class="button dropdown-button side-panel-action-content is-fullwidth"
-                            onclick="setDropDown(this)" data-dropdown-id="list-customization-order"
-                    >
-                        <span>{% translate 'Order' %}</span>
-                        <span class="icon is-small">
-                            <i class="fa fa-angle-down"></i>
-                        </span>
-                    </button>
-                </div>
+                {% if order_selection %}
+                    <div class="control is-expanded">
+                        <button id="list-customization-order-trigger"
+                                class="button dropdown-button side-panel-action-content is-fullwidth"
+                                onclick="setDropDown(this)" data-dropdown-id="list-customization-order"
+                        >
+                            <span>{% translate 'Order' %}</span>
+                            <span class="icon is-small">
+                                <i class="fa fa-angle-down"></i>
+                            </span>
+                        </button>
+                    </div>
+                {% endif %}
             </div>
         </div>
 
@@ -114,26 +116,28 @@
             </div>
         {% endif %}
 
-        <div id="list-customization-order" class="dropdown is-flex-grow-1 pt-0" role="menu" data-dropdown-trigger-id="list-customization-order-trigger">
-            <div class="dropdown-menu pt-0" style="width: 100%">
-                <div class="dropdown-content">
-                    <div class="dropdown-item">
-                        <div class="field has-addons mr-1">
-                            <p class="control is-expanded">
-                                <input class="input is-small" type="text" aria-label="Query Input" style="height: 100%">
-                            </p>
-                            <p class="control">
-                                <button id="order-selection-reset" class="button is-small has-icon" style="box-shadow: none;">
-                                    <span class="icon"><i class="fas fa-arrow-rotate-left"></i></span>
-                                </button>
-                            </p>
+        {% if order_selection %}
+            <div id="list-customization-order" class="dropdown is-flex-grow-1 pt-0" role="menu" data-dropdown-trigger-id="list-customization-order-trigger">
+                <div class="dropdown-menu pt-0" style="width: 100%">
+                    <div class="dropdown-content">
+                        <div class="dropdown-item">
+                            <div class="field has-addons mr-1">
+                                <p class="control is-expanded">
+                                    <input class="input is-small" type="text" aria-label="Query Input" style="height: 100%">
+                                </p>
+                                <p class="control">
+                                    <button id="order-selection-reset" class="button is-small has-icon" style="box-shadow: none;">
+                                        <span class="icon"><i class="fas fa-arrow-rotate-left"></i></span>
+                                    </button>
+                                </p>
+                            </div>
+                        </div>
+                        <div id="order-path-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
+                             hx-select-oob="#content,#order-path-apply,#list-pagination">
                         </div>
-                    </div>
-                    <div id="order-path-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
-                         hx-select-oob="#content,#order-path-apply,#list-pagination">
                     </div>
                 </div>
             </div>
-        </div>
+        {% endif %}
     </div>
 </div>

accrete/managers.py

@@ -21,12 +21,17 @@ class TenantManager(models.Manager, AnnotationManagerMixin):
             unique_fields=None,
     ):
         tenant = get_tenant()
-        if tenant is None and not all(obj.tenant_id for obj in objs):
+        if tenant is None and any(obj.tenant_id in (False, None) for obj in objs):
             raise ValueError(
                 'Tenant must be set for all objects when calling bulk_create'
             )
-        for obj in objs:
-            obj.tenant_id = tenant.pk
+        if tenant is not None and any(obj.tenant_id != tenant.pk for obj in objs):
+            raise ValueError(
+                'Objects must have set the same Tenant when calling bulk_create while a tenant is active'
+            )
+        elif tenant is not None:
+            for obj in objs:
+                obj.tenant_id = tenant.pk
         return super().bulk_create(
             objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
             update_conflicts=update_conflicts, update_fields=update_fields,

accrete/middleware.py

@@ -1,7 +1,7 @@
 from django.utils.deprecation import MiddlewareMixin
 from django.conf import settings
 from django.http.response import HttpResponseRedirect, HttpResponsePermanentRedirect
-from accrete.tenant import set_tenant, set_member
+from accrete.tenant import set_tenant, set_member, unscoped
 
 from .models import Tenant
 
@@ -35,10 +35,11 @@ class TenantMiddleware(MiddlewareMixin):
             return
 
         if request.user.is_authenticated:
-            memberships = request.user.memberships.filter(
-                is_active=True,
-                tenant__is_active=True
-            )
+            with unscoped():
+                memberships = request.user.memberships.filter(
+                    is_active=True,
+                    tenant__is_active=True
+                )
 
             if request.user.is_staff:
                 tenant_id = self.get_tenant_id_from_request(request)

accrete/utils/log.py

@@ -0,0 +1,16 @@
+import logging
+from functools import wraps
+from timeit import default_timer as timer
+
+_logger = logging.getLogger(__name__)
+
+
+def log_time(f):
+    @wraps(f)
+    def decorator(*args, **kwargs):
+        start = timer()
+        result = f(*args, **kwargs)
+        stop = timer()
+        _logger.info(f'{f.__module__}.{f.__name__} Duration: {(stop - start)} Seconds')
+        return result
+    return decorator

{accrete-0.0.95.dist-info → accrete-0.0.97.dist-info}/METADATA

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

{accrete-0.0.95.dist-info → accrete-0.0.97.dist-info}/RECORD

@@ -4,8 +4,8 @@ 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=vODaKmWPvgfRoYXbQ_JD-pRjd2QWM_a9Gjkllrua0WE,1164
-accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
+accrete/managers.py,sha256=R-n2WRezhTNE-EVvhNSJ6TSCroN_TAHAWSJ_SS2jxpk,1451
+accrete/middleware.py,sha256=NhtT3YPq0EynAi4F81LLLUZd5rsWDjGVn1tkgUObT3M,3477
 accrete/models.py,sha256=xliEVR0XPW46ZDJn3-F46s54tG9dxz7BVLbkq1pC144,5434
 accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
@@ -178,7 +178,7 @@ accrete/contrib/ui/templates/ui/form.html,sha256=uCtP16THdOuRfs3JdsjadIW0k9b2rN3
 accrete/contrib/ui/templates/ui/layout.html,sha256=qUACs0vR3xn5gjoJly_zexdw9XEzu_EdF2Is6y-CvJM,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/filter.html,sha256=fMxi5L1daqKElzZpHg8bItv0FlBjOkAEBxmT_OXgg4M,7434
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=C5ktasYff2xBTiWfM6QR8qaGKSyK9QufB3B9N77KGpg,1386
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=wBiyo02mON3z7l4hJAPTAJn_vDhekYZ-a0g8TuW4RmY,7015
 accrete/contrib/ui/templates/ui/partials/modal.html,sha256=Lk7ViKJS99QLjGFHKna90j6VUo_U03IDAT1Rq__QVLU,1472
@@ -230,9 +230,10 @@ accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 accrete/utils/__init__.py,sha256=BZiTZDicA1--ruZUvI_bjvPUSwI4SxfqGJc9V5n9nQc,271
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
 accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
+accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
 accrete/utils/views.py,sha256=iWZSYbd3qYMrV9wAsX26ofGb5wxn1N_nRrQ6s2lpp2I,4557
-accrete-0.0.95.dist-info/METADATA,sha256=04_9uE3qFheep7VKhxNoICWn5DlajVnm58iMv-e5Nhk,4952
-accrete-0.0.95.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.95.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.95.dist-info/RECORD,,
+accrete-0.0.97.dist-info/METADATA,sha256=obrYnpP2ESdIu5uE0B0Wp6gjlJtUwf4sy2QUGv7ZSN4,4952
+accrete-0.0.97.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.97.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.97.dist-info/RECORD,,