Skip to content

Commit 4a12212

Browse files
committed
fix: fixed list action to work also on non table list views
1 parent 03fea1b commit 4a12212

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
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.49"
3+
version = "0.2.50"
44
description = ""
55
authors = ["SmartBase <[email protected]>"]
66
readme = "README.md"

src/django_smartbase_admin/static/sb_admin/src/js/main.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,14 @@ class Main {
249249
fieldElem.dispatchEvent(new Event('change'))
250250
fieldElem.dispatchEvent(new CustomEvent('clear', {detail: {refresh: true}}))
251251
}
252+
253+
executeListAction(table_id, action_url, no_params) {
254+
if(window.SBAdminTable && window.SBAdminTable[table_id]){
255+
window.SBAdminTable[table_id].executeListAction(action_url, no_params)
256+
} else{
257+
window.location.href = action_url
258+
}
259+
}
252260
}
253261

254262
window.addEventListener('DOMContentLoaded', () => {

src/django_smartbase_admin/templates/sb_admin/actions/list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1 class="text-24 md:text-30 text-dark-900 font-bold font-heading line-clamp-1
2727
{% block dropdown_actions %}
2828
{% for list_action in content_context.list_actions %}
2929
<li>
30-
<a {% if list_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdminTable['{{ view_id }}'].executeListAction('{{ list_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
30+
<a {% if list_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ list_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
3131
class="dropdown-menu-link {{ list_action.css_class|default_if_none:'' }}">{{ list_action.title }}</a>
3232
</li>
3333
{% endfor %}
@@ -39,7 +39,7 @@ <h1 class="text-24 md:text-30 text-dark-900 font-bold font-heading line-clamp-1
3939
{% block actions %}
4040
{% for list_action in content_context.list_actions %}
4141
<li class="max-sm:hidden">
42-
<button {% if list_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdminTable['{{ view_id }}'].executeListAction('{{ list_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
42+
<button {% if list_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ list_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
4343
class="btn btn-empty {{ list_action.css_class|default_if_none:'' }}">{{ list_action.title }}
4444
</button>
4545
</li>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<li>
3434
{{ list_selection_action.items }}
3535
<a {% if list_selection_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_selection_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}"
36-
{% else %}onclick="window.SBAdminTable['{{ view_id }}'].executeListAction('{{ list_selection_action.url }}', {{ list_selection_action.no_params|yesno:'true,false' }})"{% endif %}
36+
{% else %}onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ list_selection_action.url }}', {{ list_selection_action.no_params|yesno:'true,false' }})"{% endif %}
3737
class="dropdown-menu-link {{ list_selection_action.css_class|default_if_none:'' }}">{{ list_selection_action.title }}</a>
3838
</li>
3939
{% endfor %}
@@ -42,7 +42,7 @@
4242
{% else %}
4343
{# no group #}
4444
{% for list_selection_action in list_selection_action_group %}
45-
<button {% if list_selection_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_selection_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdminTable['{{ view_id }}'].executeListAction('{{ list_selection_action.url }}', {{ list_selection_action.no_params|yesno:'true,false' }})"{% endif %}
45+
<button {% if list_selection_action.open_in_modal %}{% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=list_selection_action %} hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}" {% else %}onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ list_selection_action.url }}', {{ list_selection_action.no_params|yesno:'true,false' }})"{% endif %}
4646
class="btn btn-small {{ list_selection_action.css_class|default_if_none:'' }}">{{ list_selection_action.title }}
4747
</button>
4848
{% endfor %}

0 commit comments

Comments
 (0)