accrete 0.0.38__py3-none-any.whl → 0.0.40__py3-none-any.whl

accrete/annotation.py

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

accrete/contrib/ui/__init__.py

@@ -8,7 +8,7 @@ from .context import (
     list_page,
     detail_page,
     cast_param,
-    prepare_url_params,
+    url_param_dict,
     extract_url_params,
     exclude_params,
     url_param_str,

accrete/contrib/ui/context.py

@@ -1,4 +1,5 @@
 import logging
+from urllib.parse import quote_plus
 from dataclasses import dataclass, field
 from typing import TypedDict
 from django.utils.translation import gettext_lazy as _t
@@ -56,6 +57,7 @@ class TableContext(Context):
     endless_scroll: bool
     filter: Filter
     object_param_str: str = field(default='', kw_only=True)
+    field_selection: bool = True
 
 
 @dataclass
@@ -69,6 +71,7 @@ class ListContext(Context):
     endless_scroll: bool = True
     column_height: int = 4
     column_width: int = 12
+    field_selection: bool = False
 
     def __post_init__(self):
         super().__post_init__()
@@ -107,8 +110,8 @@ def cast_param(params: dict, param: str, cast_to: callable, default):
         return default
 
 
-def prepare_url_params(get_params: dict) -> dict:
-    return {key: f'&{key}={value}' for key, value in get_params.items()}
+def url_param_dict(get_params: dict) -> dict:
+    return {key: f'&{key}={quote_plus(value)}' for key, value in get_params.items()}
 
 
 def url_param_str(params: dict, extract: list[str] = None) -> str:
@@ -118,9 +121,9 @@ def url_param_str(params: dict, extract: list[str] = None) -> str:
     them, so that each value is formatted e.g. {'page': '&page=1'}
     """
     if extract:
-        params = prepare_url_params(extract_url_params(params, extract))
+        params = extract_url_params(params, extract)
     param_str = (
-        "".join(str(value) for value in params.values())
+        "".join(str(value) for value in url_param_dict(params).values())
         .replace('&&', '&')
         .replace('?&', '?')
         .strip('?&')
@@ -185,7 +188,7 @@ def get_table_fields(
         field_definition: dict[str | TableField] = None
 ) -> list[TableField]:
 
-    def get_alignment(field_attr):
+    def get_alignment(field_attr) -> TableFieldAlignment:
         number_field_types = (
             models.DecimalField, models.IntegerField, models.FloatField
         )
@@ -193,12 +196,11 @@ def get_table_fields(
                 isinstance(field_attr, number_field_types)
                 or (
                 isinstance(field_attr, Annotation)
-                and field_attr.field in number_field_types
-        )):
+                and field_attr.field in number_field_types)
+        ):
             return TableFieldAlignment.RIGHT
         return TableFieldAlignment.LEFT
 
-
     def get_field_definition(f_name: str) -> TableField:
         if definition := field_definition.get(f_name):
             return definition
@@ -217,12 +219,18 @@ def get_table_fields(
             elif hasattr(attr, 'field'):
                 attr = attr.field
         names.append(attr.verbose_name)
+        is_relation = (
+                attr.related_model
+                and hasattr(attr.related_model, 'get_absolute_url')
+                or False
+        )
         return TableField(
             label=' / '.join([str(name) for name in names[1:]]),
             name=f_name,
             header_info=str(attr.help_text),
             truncate_after=50,
-            alignment=get_alignment(attr)
+            alignment=get_alignment(attr),
+            is_relation=is_relation
         )
 
     if field_definition is None:
@@ -233,6 +241,7 @@ def get_table_fields(
         try:
             table_fields.append(get_field_definition(field_name))
         except AttributeError as e:
-            print(e)
+            _logger.error(e)
             pass
+
     return table_fields

accrete/contrib/ui/elements.py

@@ -69,6 +69,7 @@ class TableField:
     suffix: str = ''
     truncate_after: int = 0
     template: str = None
+    is_relation: bool = False
 
 
 @dataclass

accrete/contrib/ui/filter.py

@@ -298,14 +298,25 @@ class Filter:
 
     def field_path_selection(self):
         html = ''
-        for field in sorted(self.field_paths, key=lambda f: (len(f.split('__')), f.lower())):
-            label = self.get_field_path_label(field)
-            if not label:
-                continue
+        filter_exclude = getattr(self.model, 'filter_exclude', [])
+        filter_exclude.extend(self.default_exclude)
+        foreign_keys = [x.name for x in filter(
+            lambda x: x.is_relation and x.name not in filter_exclude,
+            self.model._meta.get_fields()
+        )]
+        field_paths = [
+            (self.get_field_path_label(field_path), field_path)
+            for field_path in filter(
+                lambda x: len(x.split('__')) <= 1,
+                self.field_paths + foreign_keys
+            )
+        ]
+        sorted_field_paths = sorted(filter(lambda x: x[0], field_paths), key=lambda x: x[0].lower())
+        for field in sorted_field_paths:
             html += f"""
-                <label class="checkbox my-1" style="width: 100%">
-                    <input type="checkbox" name="{field}">
-                    {label}
+                <label class="checkbox is-unselectable my-1" style="width: 100%">
+                    <input type="checkbox" name="{field[1]}" data-label="{field[0].lower()}">
+                    <span>{field[0]}</span>
                 </label>
             """
         return html

accrete/contrib/ui/static/js/filter.js

@@ -1,6 +1,10 @@
+document.body.addEventListener('htmx:afterSwap', function(evt) {
+    checkSelectedFields();
+});
 window.addEventListener('click', showHide);
 buildQueryTagsFromUrl();
 resetInput();
+checkSelectedFields();
 
 function buildQueryTagsFromUrl() {
     const queryTags = document.getElementById('query-tags');
@@ -249,11 +253,30 @@ function toggleFilterModalButton() {
     const button = document.getElementById('modal-filter-button');
     const query = document.getElementById('query-tags');
     if (query.firstElementChild && query.firstElementChild.childElementCount) {
-        button.classList.add('is-primary');
+        button.classList.add('is-success');
     }
     else {
-        button.classList.remove('is-primary');
-    }
+        button.classList.remove('is-success');
+    }
+}
+
+function checkSelectedFields() {
+    const table = document.getElementById('content-table');
+    const header = table.querySelectorAll('th')
+    document.getElementById(
+        'field-path-checkboxes'
+    ).querySelectorAll(
+        'input:checked'
+    ).forEach((el) => {el.checked = ''});
+    header.forEach((th) => {
+        const name = th.getAttribute('data-name');
+        if (name) {
+            document.getElementById(
+                'field-path-checkboxes'
+            ).querySelector(`input[name=${name}]`
+            ).checked = 'checked';
+        }
+    })
 }
 
 //-----------------------------------------------------------------------------
@@ -441,25 +464,57 @@ function changeOperator(event) {
 
 function toggleFieldSelection() {
     const fieldPaths = document.getElementById('field-paths');
+    const input = document.getElementById('field-path-search-input')
+    const checkBoxes = document.getElementById('field-path-checkboxes');
     this.event.target.classList.toggle('is-active');
     fieldPaths.classList.toggle('is-hidden');
+    input.value = ''
+    checkBoxes.querySelectorAll(':scope * input').forEach(
+        (el) => {
+            el.parentElement.classList.remove('is-hidden')
+        });
 }
 
 function filterFieldPaths() {
-    const input = document.getElementById('field-path-search-input');
-    const paths = document.getElementById('field-path-checkboxes').children;
-    console.log(paths)
-    console.log(paths.length)
-    for (let i = 0; paths.length < i; i++) {
-        if (!paths[i].firstElementChild.name.contains(input.value)) {
-            paths[i].classList.add('is-hidden');
-        }
+    const value = document.getElementById('field-path-search-input').value.toString().toLowerCase();
+    const checkBoxes = document.getElementById('field-path-checkboxes');
+    if (!value) {
+        checkBoxes.querySelectorAll(':scope * input').forEach(
+            (el) => {
+                el.parentElement.classList.remove('is-hidden')
+            });
+        return
     }
-    // paths.forEach(el => {
-    //     if (!el.getAttribute('name').contains(input.value)) {
-    //         el.classList.add('is-hidden');
-    //     }
-    // })
+    const pathsToShow = checkBoxes.querySelectorAll(`:scope * input[data-label*=${value}]`);
+    const pathsToHide = checkBoxes.querySelectorAll(`:scope * input:not([data-label*=${value}])`);
+    pathsToShow.forEach((el) => {el.parentElement.classList.remove('is-hidden')});
+    pathsToHide.forEach((el) => {el.parentElement.classList.add('is-hidden')})
+}
+
+function changeFieldSelection() {
+    const fieldPathApply = document.getElementById('field-path-apply');
+    const fieldPathApplyEvent = new Event('click');
+    const url = new URL(window.location)
+    const fieldPaths = document.getElementById('field-path-checkboxes');
+    const selected = fieldPaths.querySelectorAll('input:checked')
+    let fields = []
+    selected.forEach((input) => {
+        fields.push(input.name)
+    })
+    url.searchParams.set('fields', JSON.stringify(fields));
+    fieldPathApply.setAttribute('hx-get', url.toString());
+    htmx.process(fieldPathApply);
+    fieldPathApply.dispatchEvent(fieldPathApplyEvent);
+}
+
+function resetFieldPaths() {
+    const fieldPathApply = document.getElementById('field-path-apply');
+    const fieldPathApplyEvent = new Event('click');
+    const url = new URL(window.location)
+    url.searchParams.delete('fields');
+    fieldPathApply.setAttribute('hx-get', url.toString());
+    htmx.process(fieldPathApply);
+    fieldPathApply.dispatchEvent(fieldPathApplyEvent);
 }
 
 //-----------------------------------------------------------------------------

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

@@ -11,7 +11,7 @@
                     hx-get="{{ url_params }}&page={{ page.next_page_number }}"
                     hx-trigger="intersect once"
                     hx-select=".list-column"
-                    hx-select-oob="#list-pagination-end-index,#list-pagination-next-button"
+                    hx-select-oob="#list-pagination-end-index,#list-pagination-next-button,#list-pagination-prev-button"
                     hx-swap="afterend"
                 {% endif %}
             >
@@ -24,6 +24,16 @@
         {% endfor %}
     </div>
     {% if endless_scroll %}
-        <progress class="htmx-indicator progress is-small is-primary" max="100">15%</progress>
+        <div id="endless-scroller"
+            {% if list_page.has_next %}
+                hx-get="{{ url_params }}&page={{ page.next_page_number }}"
+                hx-trigger="intersect once"
+                hx-select=".list-column"
+                hx-select-oob="#list-pagination-end-index,#list-pagination-next-button,#list-pagination-prev-button,#endless-scroller"
+                hx-swap="afterend"
+            {% endif %}
+        >
+        </div>
+        <progress class="htmx-indicator progress is-small is-success" max="100">15%</progress>
     {% endif %}
 {% endblock %}

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

@@ -54,27 +54,27 @@
     <div id="query-params-dropdown" class="box mt-0 mx-0 p-1 is-hidden is-fullwidth" tabindex="-1" style="z-index: 900; background: white; word-break: break-word; position: absolute; width: 300px; max-height: 300px; overflow-y: auto" onclick="toggleParams()">
         {{ filter.to_html.params }}
     </div>
-    <div id="field-selection" class="button mt-1" style="z-index: 10; position: relative" onclick="toggleFieldSelection()">
-        {% translate 'Fields' %}
-    </div>
-    <div id="field-paths" class="box mt-1 mx-0 p-1 is-hidden" tabindex="-1" style="z-index: 800; outline: none; background: white; word-break: break-word; position: absolute; width: 300px; max-height: 300px; overflow-y: auto">
-        <div class="field has-addons mr-1">
-            <p class="control is-expanded">
-                <input id="field-path-search-input" class="input is-small" type="text" aria-label="Query Input" oninput="filterFieldPaths()">
-            </p>
-            <p class="control">
-                <button id="field-path-search-clear" class="button is-small has-icon"><i class="icon-clear"></i></button>
-            </p>
-            <p class="control">
-                <button id="field-path-search-reset" class="button is-small has-icon"><i class="icon-delete-filter"></i></button>
-            </p>
-        </div>
-        <div id="field-path-checkboxes">
-            {{ filter.to_html.field_paths }}
+    {% if field_selection %}
+        <div id="field-selection" class="button mt-1" style="z-index: 10; position: relative" onclick="toggleFieldSelection()">
+            {% translate 'Fields' %}
         </div>
-        <div id="field-path-change">
-
+        <div id="field-paths" class="box mt-1 mx-0 p-1 is-hidden" tabindex="-1" style="z-index: 800; outline: none; background: white; word-break: break-word; position: absolute; width: 300px; max-height: 300px; overflow-y: auto">
+            <div class="field has-addons mr-1">
+                <p class="control is-expanded">
+                    <input id="field-path-search-input" class="input is-small" type="text" aria-label="Query Input" oninput="filterFieldPaths()">
+                </p>
+                <p class="control">
+                    <button id="field-path-search-reset" class="button is-small has-icon" onclick="resetFieldPaths()">
+                        <i class="icon-delete-filter"></i>
+                    </button>
+                </p>
+            </div>
+            <div id="field-path-checkboxes" onchange="changeFieldSelection()">
+                {{ filter.to_html.field_paths }}
+            </div>
+            <div id="field-path-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
+                 hx-select-oob="#content,#field-path-apply,#list-pagination">
+            </div>
         </div>
-    </div>
-
+    {% endif %}
 </div>

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

@@ -1,7 +1,7 @@
 {% load i18n %}
 <div id="list-pagination" class="field has-addons" style="min-width: 100%; max-width: 100%">
     <p class="control">
-        <button class="button"
+        <button id="list-pagination-prev-button" class="button"
                 hx-get="{{ pagination_param_str }}&page={% if list_page.has_previous %}{{ list_page.previous_page_number }}{% else %}{{ list_page.paginator.num_pages }}{% endif %}"
                 hx-replace-url="true"
                 hx-select-oob="#content,#list-pagination,#panel-actions,#header-actions,#breadcrumbs"

accrete/contrib/ui/templates/ui/table.html

@@ -4,14 +4,14 @@
 {% load accrete_ui %}
 
 {% block content %}
-    <table class="table is-fullwidth is-hoverable hax-box" hx-indicator=".htmx-indicator">
+    <table id="content-table" class="table is-fullwidth is-hoverable hax-box" hx-indicator=".htmx-indicator">
         <thead style="position: sticky; top: 0; background: white; z-index: 10">
             {% block table_header_row %}
                 <tr>
                     {% block table_header %}
                         <th>{{ object_label }}</th>
                         {% for field in fields %}
-                            <th style="text-align: {% firstof field.header_alignment.value field.alignment.value %}">{{ field.label }}{% if field.header_info %}({{ field.header_info }}){% endif %}</th>
+                            <th data-name="{{ field.name }}" style="text-align: {% firstof field.header_alignment.value field.alignment.value %}">{{ field.label }}{% if field.header_info %}({{ field.header_info }}){% endif %}</th>
                         {% endfor %}
                         {% if unselect_button %}
                             <th></th>
@@ -32,18 +32,20 @@
                                 {% if field.template %}
                                     {% include field.template %}
                                 {% else %}
-                                    {% with val=obj|get_attr:field.name|default_if_none:'---'  %}
+                                    {% with val=obj|get_attr:field.name|default_if_none:'---' is_relation=field.is_relation %}
                                         <td style="text-align: {{ field.alignment.value }}" {% if val|length > field.truncate_after %}title="{{ val }}"{% endif %}>
                                             <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ field.label }}:</span>
-                                            {{ field.prefix }}
-                                            {% block td_content %}
-                                                {% if field.truncate_after > 0 %}
-                                                    {{ val|truncatechars:field.truncate_after }}
-                                                {% else %}
-                                                    {{ val }}
-                                                {% endif %}
-                                            {% endblock %}
-                                            {{ field.suffix }}
+                                            {% if is_relation %}<a href="{{ obj|related_obj_url:field.name }}" class="is-underlined">{% endif %}
+                                                {{ field.prefix }}
+                                                {% block td_content %}
+                                                    {% if field.truncate_after > 0 %}
+                                                        {{ val|truncatechars:field.truncate_after }}
+                                                    {% else %}
+                                                        {{ val }}
+                                                    {% endif %}
+                                                {% endblock %}
+                                                {{ field.suffix }}
+                                            {% if is_relation %}</a>{% endif %}
                                         </td>
                                     {% endwith %}
                                 {% endif %}
@@ -65,10 +67,11 @@
                  hx-select="tbody > tr"
                  hx-target="#content-table-body"
                  hx-swap="beforeend"
-                 hx-select-oob="#list-pagination-end-index,#list-pagination-next-button,#endless-scroller"
+                 hx-replace-url="true"
+                 hx-select-oob="#list-pagination-end-index,#list-pagination-next-button,#list-pagination-prev-button,#endless-scroller"
              {% endif %}
         >
         </div>
-        <progress class="htmx-indicator progress is-small is-primary" max="100">15%</progress>
+        <progress class="htmx-indicator progress is-small is-success" max="100">15%</progress>
     {% endif %}
 {% endblock %}

accrete/contrib/ui/templatetags/accrete_ui.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 from django import template
 from django.db.models import Model
 from django.core.cache import cache
@@ -28,18 +29,25 @@ def combine_templates(template_name, request=None):
 
 @register.filter(name='get_attr')
 def get_attr_from_string(param: object, value: str):
-    attr_name = value.split('__')
-    attr = param
-    for name in attr_name:
-        try:
-            attr = getattr(attr, name)
-        except AttributeError:
-            _logger.exception(f'Object {attr} has no attribute {name}')
-            return ''
+    try:
+        attr = operator.attrgetter(value)(param)
+    except AttributeError:
+        _logger.exception(f'Object {param} has no attribute {value}')
+        return ''
+    if attr is None:
+        return None
     if callable(attr):
-        return attr()
+        return mark_safe(attr())
     else:
-        return attr
+        return mark_safe(attr)
+
+
+@register.filter(name='related_obj_url')
+def related_obj_url(param: object, value: str):
+    attr = getattr(param, value, False)
+    if attr:
+        return attr.get_absolute_url()
+    return '#'
 
 
 @register.filter(name='message_class')

accrete/contrib/user/views.py

@@ -1,15 +1,12 @@
-from django.utils import timezone
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import views, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
-from django.contrib.sessions.models import Session
 from django.contrib import messages
-from django.db.models import Q
 from django.shortcuts import redirect, render, reverse, resolve_url
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
-from accrete.forms import save_form
+from accrete.utils import save_form
 from accrete.contrib import ui
 from .forms import UserForm, ChangePasswordForm, ChangeEmailForm
 

accrete/forms.py

@@ -290,22 +290,3 @@ class TenantModelForm(One2ManyModelForm):
             self.save_o2m()
 
         return self.instance
-
-
-def save_form(form, reraise=False):
-    form.is_saved = False
-    form.save_error = None
-    form.save_error_id = None
-    try:
-        if form.is_valid():
-            with transaction.atomic():
-                form.save()
-            form.is_saved = True
-    except Exception as e:
-        form.save_error = repr(e)
-        error_id = str(uuid4())[:8]
-        _logger.exception(f'{error_id}: {e}')
-        form.save_error_id = error_id
-        if reraise:
-            raise e
-    return form

accrete/managers.py

@@ -0,0 +1,35 @@
+from django.db import models
+from accrete.tenant import get_tenant
+from accrete.annotation import AnnotationManagerMixin
+
+
+class TenantManager(models.Manager, AnnotationManagerMixin):
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        tenant = get_tenant()
+        if tenant:
+            queryset = queryset.filter(tenant=tenant)
+        return queryset.annotate(**self.get_annotations())
+
+    def bulk_create(
+            self,
+            objs,
+            batch_size=None,
+            ignore_conflicts=False,
+            update_conflicts=False,
+            update_fields=None,
+            unique_fields=None,
+    ):
+        tenant = get_tenant()
+        if tenant is None and not all(obj.tenant_id 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
+        return super().bulk_create(
+            objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
+            update_conflicts=update_conflicts, update_fields=update_fields,
+            unique_fields=unique_fields
+        )

accrete/models.py

@@ -3,39 +3,8 @@ from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from accrete.tenant import get_tenant
-from accrete.annotation import AnnotationModelMixin, AnnotationManagerMixin
-
-
-class TenantManager(models.Manager, AnnotationManagerMixin):
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        tenant = get_tenant()
-        if tenant:
-            queryset = queryset.filter(tenant=tenant)
-        return self.add_annotations(queryset)
-
-    def bulk_create(
-            self,
-            objs,
-            batch_size=None,
-            ignore_conflicts=False,
-            update_conflicts=False,
-            update_fields=None,
-            unique_fields=None,
-    ):
-        tenant = get_tenant()
-        if tenant is None and not all(obj.tenant_id 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
-        return super().bulk_create(
-            objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
-            update_conflicts=update_conflicts, update_fields=update_fields,
-            unique_fields=unique_fields
-        )
+from accrete.annotation import AnnotationModelMixin
+from accrete.managers import TenantManager
 
 
 class TenantModel(models.Model, AnnotationModelMixin):

accrete/utils/__init__.py

@@ -0,0 +1,4 @@
+from . import dates
+from .forms import save_form
+from .http import filter_from_querystring
+from .models import get_related_model

accrete/utils/forms.py

@@ -0,0 +1,24 @@
+import logging
+from uuid import uuid4
+from django.db import transaction
+
+_logger = logging.getLogger(__name__)
+
+
+def save_form(form, reraise=False):
+    form.is_saved = False
+    form.save_error = None
+    form.save_error_id = None
+    try:
+        if form.is_valid():
+            with transaction.atomic():
+                form.save()
+            form.is_saved = True
+    except Exception as e:
+        form.save_error = repr(e)
+        error_id = str(uuid4())[:8]
+        _logger.exception(f'{error_id}: {e}')
+        form.save_error_id = error_id
+        if reraise:
+            raise e
+    return form

accrete/{querystring.py → utils/http.py}

@@ -7,14 +7,24 @@ from accrete.annotation import Annotation
 
 _logger = logging.getLogger(__name__)
 
+Querystring_KEY_MAP = {
+    'querystring': 'q',
+    'order': 'order',
+    'paginate_by': 'paginate_by',
+    'page': 'page'
+}
+
 
 def filter_from_querystring(
-        model: type[Model], query_string: str, order: list[str] = None
+        model: type[Model], get_params: dict, key_map: dict = None
 ) -> QuerySet:
 
-    order = order or model._meta.ordering
+    key_map = key_map or Querystring_KEY_MAP
+    querystring = get_params.get(key_map['querystring'], '[]')
+    order = get_params.get(key_map['order']) or model._meta.ordering
+
     return model.objects.filter(
-        parse_querystring(model, query_string)
+        parse_querystring(model, querystring)
     ).order_by(*order).distinct()
 
 
@@ -44,7 +54,7 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
             return ~expression if invert else expression
 
         objects = related_model.objects.filter(Q(**{
-            '__'.join(parts[len(x):]): value
+            '__'.join(parts[-2:]): value
         }))
         expression = Q(**{
             f'{rel_path}{"__" if rel_path else ""}id__in':
@@ -86,4 +96,4 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
 
     ops = {'&': operator.and_, '|': operator.or_, '^': operator.xor}
     query = parse_query_block(query_data)
-    return query
+    return query

{accrete-0.0.38.dist-info → accrete-0.0.40.dist-info}/METADATA

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

{accrete-0.0.38.dist-info → accrete-0.0.40.dist-info}/RECORD

@@ -1,13 +1,12 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
-accrete/annotation.py,sha256=-nYqDQPOixkD9qdzVZDCIA4lETH2fAZcCSxNmaY2s80,1251
+accrete/annotation.py,sha256=P85kNgf_ka3U8i5cwaiKaAiSm21U-xY9PKmXMZR2ulU,1160
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
-accrete/forms.py,sha256=nPDgSZao-vuVFRam2Py18yiet3Bar-A-qkWjwbeUDlg,11235
+accrete/forms.py,sha256=2LobDn8EjHIaqBcgE4_Xk-nbfN6CPQasey-l22cQcT0,10740
+accrete/managers.py,sha256=EvWURMnGadnH3d-wXwv0-sLJKD6uGY03tSCiRSGsKbo,1170
 accrete/middleware.py,sha256=RWeHHcYCfpVO4EnG5HMS52F1y5OKRzNCuidMeq6b0zY,3176
-accrete/models.py,sha256=ruPKqNeKYzqSpYRhpQ12S82iJDYxy0EjSEtNSKWeRz4,6126
-accrete/queries.py,sha256=bchiqLzE1DmR9kvQ6Yyog6cNlYK_lxpztQMOx6Hy_0c,410
-accrete/querystring.py,sha256=jtPBs3VYQ5_NVwCfjDQV-orv44KHi9b1AAzajvjwYvc,2997
+accrete/models.py,sha256=akv8BAT6Q3kxvSujgysg36nxWTizl_D9wAd14DzYhFM,5109
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/views.py,sha256=9-sgCFe_CyG-wllAcIOLujyueiq66C-zg0U7Uf5Y2wU,2954
@@ -33,12 +32,12 @@ 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=D_QP3FW_4IzP2c_4WTWyuRIENDA1AFrSOXWL_FNeSMY,445
+accrete/contrib/ui/__init__.py,sha256=B_SJ3S9v4CQLNnQKqnWRGhddq6M5gn3vEg4KKuaKGPA,441
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/context.py,sha256=IV66Dtac-MoHelVWrCmFlXQnHZ1XMfwBEYsdZ59-sbg,6870
-accrete/contrib/ui/elements.py,sha256=g6wksl7hHGJb3CKmkio5rWgcpr1Eyr2vxbKVD-59lkc,1570
-accrete/contrib/ui/filter.py,sha256=0E5dSd58s1mdDhz8WqIX19e0jPBUlEPi5NWFL8PImgA,13050
+accrete/contrib/ui/context.py,sha256=cs0wlZ2_E82bH4odOReHKEwX6KSe9ZkIORPsdCubWtw,7207
+accrete/contrib/ui/elements.py,sha256=yHWPZMb68j0b-nAMHDla-ENpIN1IArXxP3sy5jZN9PQ,1600
+accrete/contrib/ui/filter.py,sha256=cooq8c-ioa2do6Xr4FhU5PrMKyPFOJf6kfWSsHxbw1c,13600
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=TUBlz_CGs9InTZoxM78GSnucA73I8knoh_obt12RUHM,186
 accrete/contrib/ui/views.py,sha256=WpBKMsxFFG8eG4IN7TW_TPE6i3OFF7gnLDTK7JMKti8,191
@@ -124,7 +123,7 @@ accrete/contrib/ui/static/css/accrete.scss,sha256=KCY4QZNNVtIvogyNYkSwxeFzCCHs1M
 accrete/contrib/ui/static/css/icons.css,sha256=IMdNurvI1cUwpGG8n3UXRkxl8MqP2Eqkvyh2maeyghw,6301
 accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
 accrete/contrib/ui/static/icons/accrete.svg,sha256=CWHJKIgk3hxL7xIaFSz2j1cK-eF1TroCbjcF58bgOIs,1024
-accrete/contrib/ui/static/js/filter.js,sha256=wMK4rIx4J8ps3uB6J1z2wRAZ5MzkAN6D8EhFQiXybjM,22864
+accrete/contrib/ui/static/js/filter.js,sha256=vUnA0Q767uEtCgnQuUBVuv649lXUw6XmTHJnSBlQXiE,25082
 accrete/contrib/ui/static/js/htmx.min.js,sha256=s73PXHQYl6U2SLEgf_8EaaDWGQFCm6H26I-Y69hOZp4,47755
 accrete/contrib/ui/static/js/list.js,sha256=OX_81ifRmawE-1QBU5Qpq_E6sHiiNwIPleETAn9EOJw,4280
 accrete/contrib/ui/templates/django/forms/widgets/attrs.html,sha256=zNxjU4Ta_eWZkh1WhrF_VIwNZ0lZyl980gSSijUK51k,195
@@ -137,21 +136,21 @@ accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3
 accrete/contrib/ui/templates/ui/detail.html,sha256=0sqsW_XbtLVIquXA8157ZWamnwRc4Wp-6_aZgZ5HN64,1051
 accrete/contrib/ui/templates/ui/form.html,sha256=kIIG4zzNbxb5fJAVr3lI05oa3yoxyAwstMeQWLa2Z0Y,409
 accrete/contrib/ui/templates/ui/layout.html,sha256=qxLTBR16uh3ed1qm_eC-GrFkN6RYZZx0k1bX07Dcfz4,9247
-accrete/contrib/ui/templates/ui/list.html,sha256=dcPS1aSN9GlsljJsTNhKMqgPe8goF1uwknZ4DIbElLU,1212
-accrete/contrib/ui/templates/ui/table.html,sha256=xVSFKrjO_2YkSEO3nspHqMj8mQU4ZV8GSAQFSsAk5SI,3868
-accrete/contrib/ui/templates/ui/partials/filter.html,sha256=Y2-9fwV_sjrsu-Jvuh8hseku0mQTjsnePSHemps3Tqg,3936
+accrete/contrib/ui/templates/ui/list.html,sha256=oDv8I9xxsxuwoNywRqt0n0leuKocnvViFCC0OFFENDk,1695
+accrete/contrib/ui/templates/ui/table.html,sha256=Lcqd9SdvaNLoWEzW2Nli9sl__AVwi1g2UmzF9u-Nkdg,4274
+accrete/contrib/ui/templates/ui/partials/filter.html,sha256=QbfeZQyBAiwXfHqiKK8fCgCy4ofr1KuTfz2ackTVJu4,4115
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=1_TQvTdiejsn-43YSyp2YfnP52P-MFYb-HGY0DLm4oA,991
 accrete/contrib/ui/templates/ui/partials/form_modal.html,sha256=FFDfI5qjOCUBSGqDjBXa8tcqN2q94wOOCNFDaiyplHQ,1032
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=Fr65wv84RgcjpRr1jRdGzChaX08SVhmFhcdEmkTBmyI,2859
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=K5twTGqRUW1iM2dGtdWntjsJvJVo5EIzKxX2HK-H1yw,160
 accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=58nA3X7Il0FAD4VcYyr7tTGWRiVf_FN1TkImmKEpKHU,1014
-accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=9h-I5PfjViomZjoeBUZIwmx7tgWodCs4bDtjOdsPQ8c,1379
+accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=-wGY-DYMAR-m1TfA3a4tN9XfpkjE-RHBfWGzTgm_OW0,1412
 accrete/contrib/ui/templates/ui/partials/table_field.html,sha256=4oQw0na9UgHP8lo8KttyWBuDhCEeaZ8Vt9jJYJdZ5Gs,641
 accrete/contrib/ui/templates/ui/partials/table_field_float.html,sha256=GH_jFdpk8wEJXv4QfO6c3URYrZGGLeuSyWwWl2cWxwQ,45
 accrete/contrib/ui/templates/ui/partials/table_field_monetary.html,sha256=Wtod9vel2dD4vG8lUVLbtls4aU_2EG3p0E1QRRUSH10,166
 accrete/contrib/ui/templates/ui/partials/table_field_string.html,sha256=GH_jFdpk8wEJXv4QfO6c3URYrZGGLeuSyWwWl2cWxwQ,45
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/templatetags/accrete_ui.py,sha256=NBwRhaqojUGSZal7WI-Ugzl-Qiw6joygarP7B3CsfZc,1462
+accrete/contrib/ui/templatetags/accrete_ui.py,sha256=qogDSrFdJWvnTp4-VOKeh3KjWmU_DJ2C7PRcuU4a7O8,1657
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user/admin.py,sha256=YS4iApli7XUaIl9GsEJxys2j8sepX0by88omYHjff-E,85
 accrete/contrib/user/apps.py,sha256=oHDrAiHf-G57mZLyxqGJzRY2DbPprGFD-QgyVJG_ruI,156
@@ -160,7 +159,7 @@ accrete/contrib/user/middleware.py,sha256=qblcujwJsthopagyT-hPFq4HsMyGt-VvqZw5TQ
 accrete/contrib/user/models.py,sha256=SFEXG9G-XY7Nuss7DT51abDv8BWLHKYJocOhQDI_1Lw,3926
 accrete/contrib/user/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/user/urls.py,sha256=ktQJ3vZxDlKNUfzOxReeDLOduSdoW5z5Sz0LVFpxZGU,460
-accrete/contrib/user/views.py,sha256=82-RPqabxE6o7cglnfZmCUxNNRii4pmVFGiTThE4Zp0,3727
+accrete/contrib/user/views.py,sha256=oNY6HrZpUyCn0NmCRcA93JDwO64dA910F8INkvTo4Hk,3611
 accrete/contrib/user/locale/de/LC_MESSAGES/django.mo,sha256=p3rgUg6WltAVIMkQsjvjBqTsd_usLhSr1GH4Cyltc2c,433
 accrete/contrib/user/locale/de/LC_MESSAGES/django.po,sha256=f_Nxpo3HTm2L3f3zoHLfeWsZ-4IQp_EEVSku6TCZSvw,1870
 accrete/contrib/user/migrations/0001_initial.py,sha256=JWfM9PcMDfkJUdCjLWuWieGs6643qP0KdbCyr5uAZoY,2950
@@ -187,10 +186,12 @@ accrete/contrib/user_registration/templates/user_registration/mail_templates/con
 accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZFe3BA,4166
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+accrete/utils/__init__.py,sha256=BGXx2NwF4Sc6uaenKNvPZEmHuHVY1u97PPECrd1seA8,129
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
+accrete/utils/forms.py,sha256=FHR9IP76dkULCtX4H68xbQG5uvkBQZnDEXSlHyz34iU,606
+accrete/utils/http.py,sha256=dR4p-Q8xoTlrjfx0sN--vkY4ZGtYUsqqquAfPNxsXx8,3249
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.38.dist-info/METADATA,sha256=qCGJ5Bvnu6mpV3aC_R8hV6bMl2VYNjmeX2T_AhoHFqA,4892
-accrete-0.0.38.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-accrete-0.0.38.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.38.dist-info/RECORD,,
+accrete-0.0.40.dist-info/METADATA,sha256=51Qq-N3iNatoNK4Ot5au42pWHRyxydqijYO5kqk-PUE,4892
+accrete-0.0.40.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+accrete-0.0.40.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.40.dist-info/RECORD,,

accrete/queries.py

@@ -1,18 +0,0 @@
-import logging
-from accrete import models
-from accrete.tenant import get_tenant
-
-_logger = logging.getLogger(__name__)
-
-
-def is_member(tenant, user):
-    return tenant.members.filter(user=user, is_active=True).exists()
-
-
-def members_for_current_tenant():
-    tenant = get_tenant()
-    return tenant and tenant.members or models.Member.objects.none()
-
-
-def all_tenants():
-    return models.Tenant.objects.all()