crudkit 0.6.3__tar.gz → 0.6.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {crudkit-0.6.3 → crudkit-0.6.4}/CHANGELOG.md +13 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/PKG-INFO +1 -1
- {crudkit-0.6.3 → crudkit-0.6.4}/pyproject.toml +1 -1
- crudkit-0.6.4/src/crudkit/migrations/0007_view_badge_filters.py +24 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/models.py +33 -18
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_view_filters.py +14 -1
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/filters.py +3 -1
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_filters.py +32 -1
- crudkit-0.6.3/src/crudkit_frontend/static/crudkit_frontend/assets/index-Be6sC4pK.js → crudkit-0.6.4/src/crudkit_frontend/static/crudkit_frontend/assets/index-CZuMFRhk.js +180 -180
- crudkit-0.6.4/src/crudkit_frontend/static/crudkit_frontend/assets/index-Cxy1TyRo.css +1 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/templates/crudkit_frontend/index.html +2 -2
- crudkit-0.6.3/src/crudkit_frontend/static/crudkit_frontend/assets/index-Cs1_GmjM.css +0 -1
- {crudkit-0.6.3 → crudkit-0.6.4}/.gitignore +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/README.md +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/manage.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/admin.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/ai_backend.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/apps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/audit.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/authorization.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/checks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/decorators.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/fields.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/llm.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/management/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/management/commands/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/management/commands/add_default_exchange_rates.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/management/commands/backfill_ai_fields.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/management/commands/set_exchange_rate.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0001_squashed.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0002_workspace.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0003_enforce_data_invariants.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0004_changelog_audit.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0005_aicontext.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/0006_changelog_audit_indexes.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/migrations/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/profile.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/realtime.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/signals.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tasks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/templatetags/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/templatetags/crm_forms.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/templatetags/crm_time.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/templatetags/gravatar.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/templatetags/model_magic.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_ai_backend.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_ai_context.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_ai_fields.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_ai_tasks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_audit.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_authorization.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_backfill_command.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_fields.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_hardening.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_integrity.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_llm.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_money.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_tasks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/tests/test_workspace.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/utils.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit/widgets.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/authentication.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/consumers.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/metadata.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/pagination.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/permissions.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/records.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/routing.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/serializers.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/services.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_authorization.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_email_id_serialization.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_list_serialization.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_merge.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_metadata.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_realtime.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_reorder.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_search.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/tests/test_user_profile.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/urls.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/views.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_api/ws_auth.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/admin.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/agent.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/apps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/background.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/consumers.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/deps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/execution.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/0001_initial.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/0002_assistantconversation.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/0003_proposal_revert.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/0004_proposal_sources.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/0005_agent_agentrun.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/migrations/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/models.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/proposals.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/routing.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/runner.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/screen.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/signals.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tasks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/test_agents.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/test_approvals.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/test_hardening.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/test_proposals.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tests/test_sidebar.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/tools.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_assistant/utils.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/apps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/context_processors.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/static/crudkit_frontend/assets/favicon-Cit_9t8D.svg +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/tests/templates/crudkit_frontend/index.html +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/tests/test_frontend.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/tests/urls.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/urls.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_frontend/views.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/admin.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/apps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/authentication.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/checks.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/conf.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/migrations/0001_initial.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/migrations/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/models.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/oauth.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/server.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/templates/crudkit_mcp/authorize.html +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/tests/test_hardening.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/tests/test_mcp.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/tests/test_oauth.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/tools.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/urls.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/views.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/src/crudkit_mcp/well_known_urls.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/celery.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/settings.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/adapters.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/ai.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/apps.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/migrations/0001_initial.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/migrations/0002_customer_currency.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/migrations/0003_ticket_watchers.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/migrations/0004_topic_sort_order.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/migrations/__init__.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/testapp/models.py +0 -0
- {crudkit-0.6.3 → crudkit-0.6.4}/tests/urls.py +0 -0
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.6.4 (2026-10-13)
|
|
4
|
+
|
|
5
|
+
- The browser tab title on a saved view shows the view's name instead of its id, prefixed
|
|
6
|
+
with the badge count when the view has `show_badge_in_menu`. (#69)
|
|
7
|
+
- Saved views get `badge_filters`: extra `[field, comparator, value]` filters applied on top
|
|
8
|
+
of the view's own filters, only for the menu badge and tab-title count. For example, a view
|
|
9
|
+
of open chats can count just the unread ones. The list API applies them when `_badge` is
|
|
10
|
+
passed alongside `_view`, and the view form edits them with the filter builder. Needs
|
|
11
|
+
migration `crudkit.0007_view_badge_filters`. (#70)
|
|
12
|
+
- Create and edit forms show each field's `help_text` as a line under the field. It was only
|
|
13
|
+
a placeholder before, so it disappeared once the field had a value. The email composer
|
|
14
|
+
shows it as the field's hint. (#71)
|
|
15
|
+
|
|
3
16
|
## 0.6.3 (2026-10-08)
|
|
4
17
|
|
|
5
18
|
- The assistant can work in forms. With a create or edit form open (page or inline-create
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: crudkit
|
|
3
|
-
Version: 0.6.
|
|
3
|
+
Version: 0.6.4
|
|
4
4
|
Summary: A metadata-driven CRUD framework for Django: typed object IDs, soft delete, merge, change log, activity feed, saved views, AI fields and a generic REST API.
|
|
5
5
|
Project-URL: Homepage, https://github.com/fenerum/crudkit
|
|
6
6
|
Project-URL: Changelog, https://github.com/fenerum/crudkit/blob/main/backend/CHANGELOG.md
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "crudkit"
|
|
3
|
-
version = "0.6.
|
|
3
|
+
version = "0.6.4"
|
|
4
4
|
description = "A metadata-driven CRUD framework for Django: typed object IDs, soft delete, merge, change log, activity feed, saved views, AI fields and a generic REST API."
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
license = "MIT"
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
# Generated by Django 5.1.15 on 2026-10-09 08:31
|
|
2
|
+
|
|
3
|
+
import crudkit.models
|
|
4
|
+
from django.db import migrations, models
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class Migration(migrations.Migration):
|
|
8
|
+
|
|
9
|
+
dependencies = [
|
|
10
|
+
("crudkit", "0006_changelog_audit_indexes"),
|
|
11
|
+
]
|
|
12
|
+
|
|
13
|
+
operations = [
|
|
14
|
+
migrations.AddField(
|
|
15
|
+
model_name="view",
|
|
16
|
+
name="badge_filters",
|
|
17
|
+
field=models.JSONField(
|
|
18
|
+
blank=True,
|
|
19
|
+
encoder=crudkit.models.PrettyJSONEncoder,
|
|
20
|
+
help_text="Extra filters applied on top of filters when counting the menu badge, e.g. only unread. Format: same as filters",
|
|
21
|
+
null=True,
|
|
22
|
+
),
|
|
23
|
+
),
|
|
24
|
+
]
|
|
@@ -509,6 +509,15 @@ class View(BaseCrudKitModel):
|
|
|
509
509
|
help_text=("Format: [[field, comparator, value], [field, comparator, value], ...]"),
|
|
510
510
|
encoder=PrettyJSONEncoder,
|
|
511
511
|
)
|
|
512
|
+
badge_filters = models.JSONField(
|
|
513
|
+
null=True,
|
|
514
|
+
blank=True,
|
|
515
|
+
help_text=(
|
|
516
|
+
"Extra filters applied on top of filters when counting the menu badge, e.g. only unread. "
|
|
517
|
+
"Format: same as filters"
|
|
518
|
+
),
|
|
519
|
+
encoder=PrettyJSONEncoder,
|
|
520
|
+
)
|
|
512
521
|
|
|
513
522
|
order_by = models.CharField(
|
|
514
523
|
max_length=128,
|
|
@@ -553,22 +562,8 @@ class View(BaseCrudKitModel):
|
|
|
553
562
|
{"fields": _(f"Field '{field_name}' does not exist on model '{self.model}'.")}
|
|
554
563
|
)
|
|
555
564
|
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
for field_spec in self.filters:
|
|
559
|
-
if not isinstance(field_spec, list) or len(field_spec) != 3 or not isinstance(field_spec[0], str):
|
|
560
|
-
raise ValidationError(
|
|
561
|
-
{"filters": _("Filter format is invalid. Should be [field, comparator, value]")}
|
|
562
|
-
)
|
|
563
|
-
|
|
564
|
-
field_name, comparator, _value = field_spec
|
|
565
|
-
# Skip validating field paths with relationships (field__subfield)
|
|
566
|
-
if "__" not in field_name and field_name not in model_field_names:
|
|
567
|
-
raise ValidationError(
|
|
568
|
-
{"filters": _(f"Field '{field_name}' does not exist on model '{self.model}'.")}
|
|
569
|
-
)
|
|
570
|
-
if comparator not in self.FILTER_COMPARATORS:
|
|
571
|
-
raise ValidationError({"filters": _(f"Unknown comparator '{comparator}'.")})
|
|
565
|
+
self._validate_filters("filters", self.filters, model_field_names)
|
|
566
|
+
self._validate_filters("badge_filters", self.badge_filters, model_field_names)
|
|
572
567
|
|
|
573
568
|
# Validate order_by fields exist
|
|
574
569
|
if self.order_by:
|
|
@@ -611,8 +606,28 @@ class View(BaseCrudKitModel):
|
|
|
611
606
|
{"fields": _("Quadrant views require at least 2 fields (first=X-axis, second=Y-axis).")}
|
|
612
607
|
)
|
|
613
608
|
|
|
609
|
+
def _validate_filters(self, key, filters, model_field_names):
|
|
610
|
+
for field_spec in filters or []:
|
|
611
|
+
if not isinstance(field_spec, list) or len(field_spec) != 3 or not isinstance(field_spec[0], str):
|
|
612
|
+
raise ValidationError({key: _("Filter format is invalid. Should be [field, comparator, value]")})
|
|
613
|
+
|
|
614
|
+
field_name, comparator, _value = field_spec
|
|
615
|
+
# Skip validating field paths with relationships (field__subfield)
|
|
616
|
+
if "__" not in field_name and field_name not in model_field_names:
|
|
617
|
+
raise ValidationError({key: _(f"Field '{field_name}' does not exist on model '{self.model}'.")})
|
|
618
|
+
if comparator not in self.FILTER_COMPARATORS:
|
|
619
|
+
raise ValidationError({key: _(f"Unknown comparator '{comparator}'.")})
|
|
620
|
+
|
|
614
621
|
def filter(self, qs, request=None):
|
|
615
|
-
|
|
622
|
+
return self._apply_filters(qs, self.filters, request)
|
|
623
|
+
|
|
624
|
+
def badge_filter(self, qs, request=None):
|
|
625
|
+
"""The view's filters plus `badge_filters`: what the menu badge counts."""
|
|
626
|
+
return self._apply_filters(self.filter(qs, request), self.badge_filters, request)
|
|
627
|
+
|
|
628
|
+
@staticmethod
|
|
629
|
+
def _apply_filters(qs, filters, request=None):
|
|
630
|
+
for field, comparator, value in filters or []:
|
|
616
631
|
# Resolve variables like ${user} if a request is provided
|
|
617
632
|
if request and isinstance(value, str):
|
|
618
633
|
from crudkit.utils import resolve_variable_value
|
|
@@ -639,7 +654,7 @@ class View(BaseCrudKitModel):
|
|
|
639
654
|
return get_model_types()[self.model]
|
|
640
655
|
|
|
641
656
|
def get_count(self, request=None):
|
|
642
|
-
return self.
|
|
657
|
+
return self.badge_filter(self.get_model().objects.all(), request=request).count()
|
|
643
658
|
|
|
644
659
|
class CrudKitSettings(BaseCrudKitModel.CrudKitSettings):
|
|
645
660
|
allowed_prefills = ["model", "fields"]
|
|
@@ -22,12 +22,13 @@ class ViewFilterTests(TestCase):
|
|
|
22
22
|
name="Globex", status="churned", owner=self.other, balance=Decimal("50"), **audit
|
|
23
23
|
)
|
|
24
24
|
|
|
25
|
-
def make_view(self, filters):
|
|
25
|
+
def make_view(self, filters, badge_filters=None):
|
|
26
26
|
return View(
|
|
27
27
|
name="Filtered",
|
|
28
28
|
model="CUS",
|
|
29
29
|
fields=["name"],
|
|
30
30
|
filters=filters,
|
|
31
|
+
badge_filters=badge_filters,
|
|
31
32
|
created_by=self.user,
|
|
32
33
|
updated_by=self.user,
|
|
33
34
|
)
|
|
@@ -60,3 +61,15 @@ class ViewFilterTests(TestCase):
|
|
|
60
61
|
|
|
61
62
|
def test_filter_resolves_current_user(self):
|
|
62
63
|
self.assertEqual(self.names([["owner", "=", "${user}"]]), ["Acme"])
|
|
64
|
+
|
|
65
|
+
def test_clean_validates_badge_filters(self):
|
|
66
|
+
with self.assertRaises(ValidationError) as ctx:
|
|
67
|
+
self.make_view([], [["name", "~", "Acme"]]).clean()
|
|
68
|
+
self.assertIn("badge_filters", ctx.exception.message_dict)
|
|
69
|
+
|
|
70
|
+
def test_badge_filter_narrows_the_view(self):
|
|
71
|
+
request = SimpleNamespace(user=self.user)
|
|
72
|
+
view = self.make_view([["balance", ">=", 10]], [["owner", "=", "${user}"]])
|
|
73
|
+
self.assertEqual(view.filter(Customer.objects.all(), request).count(), 2)
|
|
74
|
+
self.assertEqual([c.name for c in view.badge_filter(Customer.objects.all(), request)], ["Acme"])
|
|
75
|
+
self.assertEqual(view.get_count(request), 1)
|
|
@@ -29,7 +29,9 @@ class BasicFilter(filters.BaseFilterBackend):
|
|
|
29
29
|
model_type_id = getattr(queryset.model, "TYPE_ID", None)
|
|
30
30
|
if model_type_id and view_obj.model != model_type_id:
|
|
31
31
|
raise ValidationError("Saved view does not match this model.")
|
|
32
|
-
if
|
|
32
|
+
if "_badge" in request.query_params:
|
|
33
|
+
queryset = view_obj.badge_filter(queryset, request=request)
|
|
34
|
+
else:
|
|
33
35
|
queryset = view_obj.filter(queryset, request=request)
|
|
34
36
|
# Handle standard field filters
|
|
35
37
|
for field in queryset.model._meta.get_fields():
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
from django.contrib.auth.models import User
|
|
2
2
|
from django.test import TestCase
|
|
3
3
|
from rest_framework.request import Request
|
|
4
|
-
from rest_framework.test import APIRequestFactory
|
|
4
|
+
from rest_framework.test import APIClient, APIRequestFactory
|
|
5
5
|
|
|
6
6
|
from crudkit.models import View
|
|
7
7
|
from crudkit_api.filters import BasicFilter
|
|
8
|
+
from tests.testapp.models import Customer
|
|
8
9
|
|
|
9
10
|
|
|
10
11
|
class MockView:
|
|
@@ -237,3 +238,33 @@ class TestBasicFilter(TestCase):
|
|
|
237
238
|
self.assertEqual(result.applied_order_by[1], "created_at")
|
|
238
239
|
# Third field should be -updated_at
|
|
239
240
|
self.assertEqual(result.applied_order_by[2], "-updated_at")
|
|
241
|
+
|
|
242
|
+
|
|
243
|
+
class BadgeFilterTests(TestCase):
|
|
244
|
+
def setUp(self):
|
|
245
|
+
self.user = User.objects.create_superuser(username="admin", password="pw")
|
|
246
|
+
audit = {"created_by": self.user, "updated_by": self.user}
|
|
247
|
+
Customer.objects.create(name="Acme", owner=self.user, **audit)
|
|
248
|
+
Customer.objects.create(name="Globex", **audit)
|
|
249
|
+
Customer.objects.create(name="Initech", status="churned", owner=self.user, **audit)
|
|
250
|
+
self.view = View.objects.create(
|
|
251
|
+
name="Active",
|
|
252
|
+
model="CUS",
|
|
253
|
+
fields=["name"],
|
|
254
|
+
filters=[["status", "!=", "churned"]],
|
|
255
|
+
badge_filters=[["owner", "=", "${user}"]],
|
|
256
|
+
**audit,
|
|
257
|
+
)
|
|
258
|
+
self.client = APIClient()
|
|
259
|
+
self.client.force_authenticate(self.user)
|
|
260
|
+
|
|
261
|
+
def count(self, params):
|
|
262
|
+
response = self.client.get("/api/v1/CUS/", {"page_size": 1, **params})
|
|
263
|
+
self.assertEqual(response.status_code, 200)
|
|
264
|
+
return response.data["count"]
|
|
265
|
+
|
|
266
|
+
def test_view_alone_ignores_badge_filters(self):
|
|
267
|
+
self.assertEqual(self.count({"_view": self.view.pk}), 2)
|
|
268
|
+
|
|
269
|
+
def test_badge_param_applies_badge_filters_on_top(self):
|
|
270
|
+
self.assertEqual(self.count({"_view": self.view.pk, "_badge": 1}), 1)
|