Skip to content

Commit 40a1928

Browse files
committed
triv: hide search field if not search_fields defined
1 parent 42436cd commit 40a1928

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "django-smartbase-admin"
3-
version = "0.2.22"
3+
version = "0.2.23"
44
description = ""
55
authors = ["SmartBase <[email protected]>"]
66
readme = "README.md"

src/django_smartbase_admin/actions/admin_action_list.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ def get_template_data(self):
170170
"tabulator_header_template_name": self.view.get_tabulator_header_template_name(
171171
self.threadsafe_request
172172
),
173+
"search_fields": self.view.get_search_fields(self.threadsafe_request),
173174
"search_field_placeholder": self.view.get_search_field_placeholder(),
174175
"list_actions": self.view.process_actions_permissions(
175176
self.threadsafe_request, list_actions

src/django_smartbase_admin/static/sb_admin/src/js/table_modules/filter_options_module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class FilterOptionsModule extends SBAdminTableModule {
2626
const targetTabValue = params[this.table.constants.FILTER_DATA_NAME]?.[this.table.constants.TABLE_PARAMS_SELECTED_FILTER_TYPE]
2727
if (targetTabValue) {
2828
targetInput.value = targetTabValue
29-
document.getElementById(targetTabValue).click()
3029
}
30+
document.getElementById(targetInput.value).click()
3131
}
3232
}

src/django_smartbase_admin/templates/sb_admin/actions/partials/tabulator_header_v2.html

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@
66
<ul class="saved-filters js-filters-options py-12 px-16" role="tablist">
77
<input form="{{ view_id }}-filter-form"
88
type="hidden"
9-
value="tab_quick_search"
9+
value="{% if content_context.search_fields %}tab_quick_search{% else %}tab_saved_views{% endif %}"
1010
id="id_{{ content_context.const.TABLE_PARAMS_SELECTED_FILTER_TYPE }}"
1111
name="{{ content_context.const.TABLE_PARAMS_SELECTED_FILTER_TYPE }}">
12-
<li role="presentation">
13-
<button class="relative show active"
14-
id="tab_quick_search"
15-
data-bs-disable-history
16-
data-bs-toggle="tab"
17-
data-bs-target="#quick_search_content"
18-
type="button" role="tab" aria-controls="quick_search_content"
19-
aria-selected="true">
20-
{% trans 'Quick Search' %}
21-
</button>
22-
</li>
23-
12+
{% if content_context.search_fields %}
13+
<li role="presentation">
14+
<button class="relative show active"
15+
id="tab_quick_search"
16+
data-bs-disable-history
17+
data-bs-toggle="tab"
18+
data-bs-target="#quick_search_content"
19+
type="button" role="tab" aria-controls="quick_search_content"
20+
aria-selected="true">
21+
{% trans 'Quick Search' %}
22+
</button>
23+
</li>
24+
{% endif %}
2425
<li role="presentation">
2526
<button class="relative"
2627
id="tab_saved_views"
@@ -48,7 +49,8 @@
4849
</ul>
4950
</div>
5051
<div class="border-dark-200 border-t">
51-
<div class="tab-pane fade active show min-h-64 content-center" id="quick_search_content" role="tabpanel" aria-labelledby="tab_quick_search">
52+
{% if content_context.search_fields %}
53+
<div class="tab-pane fade active show min-h-64 content-center" id="quick_search_content" role="tabpanel" aria-labelledby="tab_quick_search">
5254
<div class="py-12 px-16">
5355

5456
<div class="flex gap-12">
@@ -74,6 +76,7 @@
7476
</div>
7577
</div>
7678
</div>
79+
{% endif %}
7780
<div class="tab-pane fade min-h-64 content-center" id="saved_views_content" role="tabpanel" aria-labelledby="tab_saved_views">
7881
{% with 'filters-collapse-button' as filters_collapse_button_id %}
7982
{% get_item request.COOKIES filters_collapse_button_id as collapse_opened %}

0 commit comments

Comments
 (0)