django-smartbase-admin 0.2.47__py3-none-any.whl → 1.0.38__py3-none-any.whl

django_smartbase_admin/templates/sb_admin/actions/object_history.html

@@ -30,7 +30,7 @@
                             <td class="p-16"><strong>{{ action.action_time|date:"DATETIME_FORMAT" }}</strong></td>
                             <td class="p-16">{{ action.user.get_username }}{% if action.user.get_full_name %} (
                                 {{ action.user.get_full_name }}){% endif %}</td>
-                            <td class="p-16">{{ action.get_change_message }}</td>
+                            <td class="p-16">{% get_log_entry_message action as entry_log %} {{ entry_log|linebreaks }}</td>
                         </tr>
                     {% endfor %}
                     </tbody>
@@ -42,4 +42,4 @@
         {% endif %}
     </div>
 
-{% endblock %}
+{% endblock %}

django_smartbase_admin/templates/sb_admin/actions/partials/action_link.html

@@ -0,0 +1,14 @@
+<a {% if action.open_in_modal %}
+    {% include 'sb_admin/actions/partials/open_modal_attrs.html' with action=action %}
+    hx-vals="js:{params: window.SBAdminTable['{{ view_id }}'].getAllUrlParams()}"
+{% else %}
+    onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ action.url }}', {{ action.no_params|yesno:'true,false' }}, {{ action.open_in_new_tab|default:False|yesno:'true,false'|lower }})"
+{% endif %}
+    class="{{ extra_classes|default:'' }} {{ action.css_class|default_if_none:'' }}">
+    {% if action.icon %}
+        <svg class="w-16 h-16 mr-8">
+            <use xlink:href="#{{ action.icon }}"></use>
+        </svg>
+    {% endif %}
+    {{ action.title }}
+</a>

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

@@ -33,7 +33,7 @@
                             <li>
                                 {{ list_selection_action.items }}
                                 <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()}"
-                                                                                                                                                                                {% else %}onclick="window.SBAdminTable['{{ view_id }}'].executeListAction('{{ list_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
+                                                                                                                                                                                {% else %}onclick="window.SBAdmin.executeListAction('{{ view_id }}', '{{ list_selection_action.url }}', {{ list_selection_action.no_params|yesno:'true,false' }})"{% endif %}
                                                                                                                                                                                 class="dropdown-menu-link {{ list_selection_action.css_class|default_if_none:'' }}">{{ list_selection_action.title }}</a>
                             </li>
                         {% endfor %}
@@ -42,7 +42,7 @@
             {% else %}
                 {# no group #}
                 {% for list_selection_action in list_selection_action_group %}
-                    <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_action.url }}', {{ list_action.no_params|yesno:'true,false' }})"{% endif %}
+                    <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 %}
                                                                                                                                                                           class="btn btn-small {{ list_selection_action.css_class|default_if_none:'' }}">{{ list_selection_action.title }}
                     </button>
                 {% endfor %}

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

@@ -7,7 +7,7 @@
                 <input form="{{ view_id }}-filter-form"
                        type="hidden"
                        value=""
-                       id="id_{{ content_context.const.TABLE_PARAMS_SELECTED_FILTER_TYPE }}"
+                       id="{{ view_id }}-{{ content_context.const.TABLE_PARAMS_SELECTED_FILTER_TYPE }}"
                        name="{{ content_context.const.TABLE_PARAMS_SELECTED_FILTER_TYPE }}">
                 {% block table_header_before_tabs_header %}
                 {% endblock %}
@@ -85,7 +85,7 @@
                                     </svg>
                                 </div>
                             </div>
-                            <button class="btn btn-primary">{% trans 'Search' %}</button>
+                            <button type="button" class="btn btn-primary">{% trans 'Search' %}</button>
                         </div>
                     </div>
                 </div>

django_smartbase_admin/templates/sb_admin/actions/tree_list.html

@@ -0,0 +1,63 @@
+{% extends "sb_admin/actions/list.html" %}
+{% load static sb_admin_tags i18n %}
+
+{% block extrahead %}
+	{{ block.super }}
+    <style>
+        #table-columns-dropdown-wrapper {
+            display: none;
+        }
+    </style>
+{% endblock %}
+
+{% block tabulator_card %}
+    {% with enable_table_filter=request.reorder_active|yesno:',True' %}
+        {% if enable_table_filter %}
+            {{ block.super }}
+        {% else %}
+        <div class="overflow-hidden pb-8 relative tree-list-view">
+            {{ block.super }}
+        </div>
+        {% endif %}
+    {% endwith %}
+{% endblock %}
+
+{% block tabulator_custom_header %}
+    {% if not request.reorder_active %}
+        {% include content_context.tabulator_header_template_name %}
+    {% endif %}
+{% endblock %}
+{% block tabulator_body %}
+    {% with view_id|add:'_tree' as tree_id %}
+        <div class="overflow-auto w-full relative">
+            {% include "sb_admin/widgets/tree_base.html" with tree_main_column_name=list_title tree_reorder_url=content_context.tabulator_definition.treeReorderUrl tree_additional_columns=additional_columns tree_component_id=tree_id tree_data_url=tree_json_url tree_detail_url=content_context.tabulator_definition.tableDetailUrl hide_tree_search=True filter_by_table_data=enable_table_filter tree_show_checkbox=enable_table_filter tree_multiselect=enable_table_filter search_wrapper_classes="py-16 md:p-16" %}
+        </div>
+    {% endwith %}
+    {% if not request.reorder_active %}
+        <div class="hidden">
+            {{ block.super }}
+        </div>
+    {% endif %}
+{% endblock %}
+{% block tabulator_custom_footer %}
+{% endblock %}
+
+{% block actions %}
+    {% with view_id|add:'_tree' as tree_id %}
+        {% if request.request_data.action == 'action_enter_reorder' %}
+            <li class="max-sm:hidden">
+                <button onclick="$.ui.fancytree.getTree('#' + '{{ tree_id }}' + '_tree').saveTreeOrder()"
+                        class="btn btn-empty">
+                    {% trans 'Save Order' %}
+                </button>
+            </li>
+        {% endif %}
+    {% endwith %}
+    {{ block.super }}
+{% endblock %}
+
+{% block additional_js %}
+    {% if not request.reorder_active %}
+        {{ block.super }}
+    {% endif %}
+{% endblock %}

django_smartbase_admin/templates/sb_admin/authentification/login_base.html

@@ -2,8 +2,12 @@
 {% load i18n static %}
 
 {% block main_wrapper %}
+    {% include "sb_admin/includes/notifications.html" with classes="top-16 xl:!left-0" %}
     <div class="flex items-center max-h-screen">
-        <img loading="lazy" src="{% static "sb_admin/images/logo.svg" %}" alt="Logo" class="max-h-40 absolute md:left-40 md:top-40 left-24 top-24">
+        <img loading="lazy" src="{% static "sb_admin/images/logo.svg" %}" alt="Logo"
+             class="max-h-40 absolute md:left-40 md:top-40 left-24 top-24 dark:hidden">
+        <img loading="lazy" src="{% static "sb_admin/images/logo_light.svg" %}" alt="Logo"
+             class="max-h-40 absolute md:left-40 md:top-40 left-24 top-24 hidden dark:block">
         <div class="md:max-w-640 w-full flex justify-center items-center h-screen">
             <div class="max-w-370 w-full mx-24">
                 {% block content %}{% endblock %}

django_smartbase_admin/templates/sb_admin/components/columns.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<div class="inline-flex relative js-select-all-wrapper">
+<div id="table-columns-dropdown-wrapper" class="inline-flex relative js-select-all-wrapper">
     <button
             data-bs-toggle="dropdown"
             aria-expanded="false"

django_smartbase_admin/templates/sb_admin/components/filters_v2.html

@@ -19,92 +19,106 @@
     <div class="query-builder-wrapper p-24 flex md:flex-wrap gap-8 max-sm:overflow-x-auto">
         <div id="{{ view_id }}-advanced-filter" class="query-builder-advanced"></div>
         <script>
-            window.addEventListener("SBinitOrUpdateQueryBuilder", (event) => {
-                const SBTable = event.detail.SBTable.table;
-                const filterData = event.detail.filterData;
-                const queryBuilderEl$ = $("#{{ view_id }}-advanced-filter");
-                if (!queryBuilderEl$[0].queryBuilder) {
-                    queryBuilderEl$.on("afterCreateRuleInput.queryBuilder", function(event, rule) {
-                        setTimeout(() => {
-                            //next tick
-                            SBTable.moduleInstances.advancedFilterModule.initFilters(event, rule)
-                        }, 0)
-                    })
-                    queryBuilderEl$.on("afterUpdateRuleOperator.queryBuilder", function(event, rule, previousOperator) {
-                        setTimeout(() => {
-                            SBTable.moduleInstances.advancedFilterModule.afterUpdateRuleOperator(event, rule, previousOperator)
-                        }, 0)
-                    })
-                    let customOptions = document.getElementById('query-builder-custom-options')
-                    if(customOptions) {
-                        customOptions = JSON.parse(customOptions.textContent)
+            (function(){
+                // used to prevent calling initFilters on page load
+                // because afterUpdateRuleOperator is also called at that time
+                // and filters would be initiated twice, causing date field to have no value
+                let init = true;
+
+                window.addEventListener("SBinitOrUpdateQueryBuilder", (event) => {
+                    const SBTable = event.detail.SBTable.table;
+                    const filterData = event.detail.filterData;
+                    const queryBuilderEl$ = $("#{{ view_id }}-advanced-filter");
+                    init = true;
+                    if (!queryBuilderEl$[0].queryBuilder) {
+                        queryBuilderEl$.on("afterCreateRuleInput.queryBuilder", function(event, rule) {
+                            setTimeout(() => {
+                                //next tick
+                                SBTable.moduleInstances.advancedFilterModule.initFilters(event, rule);
+                            }, 0);
+                        })
+                        queryBuilderEl$.on("afterSetRules.queryBuilder", function(event, rule) {
+                            init = false;
+                        });
+                        queryBuilderEl$.on("afterUpdateRuleOperator.queryBuilder", function(event, rule, previousOperator) {
+                            if(init) {
+                                return;
+                            };
+                            setTimeout(() => {
+                                SBTable.moduleInstances.advancedFilterModule.afterUpdateRuleOperator(event, rule, previousOperator);
+                            }, 0);
+                        });
+                        let customOptions = document.getElementById('query-builder-custom-options');
+                        if(customOptions) {
+                            customOptions = JSON.parse(customOptions.textContent);
+                        };
+                        queryBuilderEl$.queryBuilder({
+                            operators: {{ content_context.advanced_filters_data.all_operators|safe }},
+                            templates: {
+                                group: function({ group_id, level, conditions, icons, settings, translate, builder }) {
+                                    return `
+                                <div id="${group_id}" class="rules-group-container">
+                                  <div class="rules-group-header">
+                                    <div class="btn-group group-conditions">
+                                      ${conditions.map(condition => `
+                                        <label class="btn btn-sm btn-primary">
+                                          <input type="radio" name="${group_id}_cond" value="${condition}"> ${translate("conditions", condition)}
+                                        </label>
+                                      `).join("\n")}
+                                    </div>
+                                    ${settings.display_errors ? `
+                                      <div class="error-container"><i class="${icons.error}"></i></div>
+                                    ` : ""}
+                                  </div>
+                                  <div class=rules-group-body>
+                                    <div class=rules-list></div>
+                                  </div>
+                                    <div class="btn-group float-end group-actions">
+                                      <button type="button" class="btn btn-sm btn-success" data-add="rule">
+                                        <i class="${icons.add_rule}"></i> ${translate("add_rule")}
+                                      </button>
+                                      ${settings.allow_groups === -1 || settings.allow_groups >= level ? `
+                                        <button type="button" class="btn btn-sm" data-add="group">
+                                          <i class="${icons.add_group}"></i> ${translate("add_group")}
+                                        </button>
+                                      ` : ""}
+                                      ${level > 1 ? `
+                                        <button type="button" class="btn btn-sm btn-danger" data-delete="group">
+                                          <i class="${icons.remove_group}"></i> ${translate("delete_group")}
+                                        </button>
+                                      ` : ""}
+                                      <button type="button" class="btn btn-sm btn-primary" data-execute>
+                                        ${translate("view_results")}
+                                      </button>
+                                    </div>
+                                </div>`
+                                }
+                            },
+                            allow_groups: false,
+                            allow_empty: true,
+                            filters: [
+                                {% for filter in content_context.advanced_filters_data.filters %}
+                                    {
+                                        id: '{{ filter.id }}',
+                                        field: '{{ filter.field }}',
+                                        type: '{{ filter.type }}',
+                                        label: '{{ filter.label }}',
+                                        operators: {{ filter.operators|safe }},
+                                        input: function(rule, name) {
+                                            return `{{ filter.input|safe }}`.replaceAll(
+                                                '{{ content_context.advanced_filters_data.prefix_to_replace }}',
+                                                name
+                                            )
+                                        }
+                                    },
+                                {% endfor %}
+                            ],
+                            ...customOptions
+                        })
                     }
-                    queryBuilderEl$.queryBuilder({
-                        operators: {{ content_context.advanced_filters_data.all_operators|safe }},
-                        templates: {
-                            group: function({ group_id, level, conditions, icons, settings, translate, builder }) {
-                                return `
-                            <div id="${group_id}" class="rules-group-container">
-                              <div class="rules-group-header">
-                                <div class="btn-group group-conditions">
-                                  ${conditions.map(condition => `
-                                    <label class="btn btn-sm btn-primary">
-                                      <input type="radio" name="${group_id}_cond" value="${condition}"> ${translate("conditions", condition)}
-                                    </label>
-                                  `).join("\n")}
-                                </div>
-                                ${settings.display_errors ? `
-                                  <div class="error-container"><i class="${icons.error}"></i></div>
-                                ` : ""}
-                              </div>
-                              <div class=rules-group-body>
-                                <div class=rules-list></div>
-                              </div>
-                                <div class="btn-group float-end group-actions">
-                                  <button type="button" class="btn btn-sm btn-success" data-add="rule">
-                                    <i class="${icons.add_rule}"></i> ${translate("add_rule")}
-                                  </button>
-                                  ${settings.allow_groups === -1 || settings.allow_groups >= level ? `
-                                    <button type="button" class="btn btn-sm" data-add="group">
-                                      <i class="${icons.add_group}"></i> ${translate("add_group")}
-                                    </button>
-                                  ` : ""}
-                                  ${level > 1 ? `
-                                    <button type="button" class="btn btn-sm btn-danger" data-delete="group">
-                                      <i class="${icons.remove_group}"></i> ${translate("delete_group")}
-                                    </button>
-                                  ` : ""}
-                                  <button type="button" class="btn btn-sm btn-primary" data-execute>
-                                    ${translate("view_results")}
-                                  </button>
-                                </div>
-                            </div>`
-                            }
-                        },
-                        allow_groups: false,
-                        allow_empty: true,
-                        filters: [
-                            {% for filter in content_context.advanced_filters_data.filters %}
-                                {
-                                    id: '{{ filter.id }}',
-                                    field: '{{ filter.field }}',
-                                    type: '{{ filter.type }}',
-                                    label: '{{ filter.label }}',
-                                    operators: {{ filter.operators|safe }},
-                                    input: function(rule, name) {
-                                        return `{{ filter.input|safe }}`.replaceAll(
-                                            '{{ content_context.advanced_filters_data.prefix_to_replace }}',
-                                            name
-                                        )
-                                    }
-                                },
-                            {% endfor %}
-                        ],
-                        ...customOptions
-                    })
-                }
-                queryBuilderEl$.queryBuilder("setRules", filterData)
-            })
+                    queryBuilderEl$.queryBuilder("setRules", filterData);
+                });
+            }());
         </script>
     </div>
 {% endblock %}

django_smartbase_admin/templates/sb_admin/config/view.html

@@ -78,4 +78,3 @@
            id="{{ content_context.const.URL_PARAMS_NAME }}" form="view_form">
 
 </form>
-{% include 'sb_admin/includes/confirmation.html' %}

django_smartbase_admin/templates/sb_admin/dashboard/calendar_widget.html

@@ -0,0 +1,69 @@
+{% extends "sb_admin/dashboard/widget_base.html" %}
+{% load sb_admin_tags static i18n %}
+
+{% block filters %}{% endblock %}
+
+{% block content_inner %}
+    <div id="{{ widget_id }}" class="card p-16 pb-0 col-span-12">
+        <div class="p-8 flex items-center justify-between">
+            <div class="flex flex-col">
+                <div class="text-18 text-dark-900 font-semibold">
+                    {% trans 'Calendar' %}
+                </div>
+                <div class="text-14">
+                    <span id="{{ widget_id }}-date-from"></span>
+                    -
+                    <span id="{{ widget_id }}-date-to"></span>
+                </div>
+            </div>
+
+            <div class="flex gap-16 items-center">
+                {% include 'sb_admin/components/filters.html' with filters=settings all_filters_visible=True %}
+                <div class="btn-group">
+                    <button class="btn p-0 w-40" onclick="window.SBAdminCalendar['{{ widget_id }}'].calendar.prev();">
+                        <svg><use href="#Left-small"></use></svg>
+                    </button>
+                    <div class="btn pointer-events-none" id="{{ widget_id }}-selected-month" style="width: 150px;"></div>
+                    <button class="btn p-0 w-40" onclick="window.SBAdminCalendar['{{ widget_id }}'].calendar.next();">
+                        <svg><use href="#Right-small"></use></svg>
+                    </button>
+                </div>
+            </div>
+        </div>
+        <div class="mt-16 -mx-16">
+            <script type="text/javascript" src="{% static 'sb_admin/js/fullcalendar.min.js' %}"></script>
+            <link rel="stylesheet" href="{% static 'sb_admin/dist/calendar_style.css' %}">
+            <script type="text/javascript" src="{% static 'sb_admin/dist/calendar.js' %}"></script>
+
+            <script>
+                document.addEventListener('DOMContentLoaded', function() {
+                    const selectedMonth = document.getElementById('{{ widget_id }}-selected-month');
+                    const dateFrom = document.getElementById('{{ widget_id }}-date-from');
+                    const dateTo = document.getElementById('{{ widget_id }}-date-to');
+
+                    window.SBAdminCalendar = window.SBAdminCalendar || {};
+                    window.SBAdminCalendar["{{ widget_id }}"] = new window.SBAdminCalendarClass({
+                        "widgetId": "{{ widget_id }}",
+                        "calendarOptions": {
+                            initialView: 'dayGridMonth',
+                            events: {
+                                url: "{{ ajax_url }}",
+                            },
+                            dayMaxEvents: 3,
+                            height: 'auto',
+                            locale: '{{request.LANGUAGE_CODE}}',
+                            headerToolbar: false,
+                            fixedWeekCount: false,
+                            datesSet: function(info) {
+                                selectedMonth.innerText = info.view.title;
+                                dateFrom.innerText = info.view.currentStart.toLocaleDateString('{{request.LANGUAGE_CODE}}', {day: 'numeric', month: 'long', year: 'numeric'});
+                                dateTo.innerText = new Date(info.view.currentStart.getFullYear(), info.view.currentStart.getMonth() + 1, 0).toLocaleDateString('{{request.LANGUAGE_CODE}}', {day: 'numeric', month: 'long', year: 'numeric'});
+                            }
+                        }
+                    });
+                });
+            </script>
+            <div id="{{ widget_id }}-calendar"></div>
+        </div>
+    </div>
+{% endblock %}

django_smartbase_admin/templates/sb_admin/dashboard/chart_widget.html

@@ -2,7 +2,7 @@
 {% load sb_admin_tags static %}
 
 {% block content_inner %}
-    <div class="card sm:mb-24 p-16">
+    <div id="{{ widget_id }}" class="card p-16 col-span-12">
         <div class="mt-16">
             <script type="text/javascript" src="{% static 'sb_admin/dist/chart.js' %}"></script>
             <div class="flex flex-wrap -m-8 mb-16">
@@ -17,9 +17,28 @@
             <script>
                 window.SBAdminChart = window.SBAdminChart || {};
                 window.SBAdminChart["{{ widget_id }}"] = new window.SBAdminChartClass({
+                    "formId": "{{ widget_id }}-filter-form",
                     "widgetId": "{{ widget_id }}",
                     "ajaxUrl": "{{ ajax_url }}",
-                    "chartType": "{{ chart_type }}"
+                    "chartType": "{{ chart_type }}",
+                    "chartOptions": {
+                        scales: {
+                            x: {
+                                ticks: {
+                                    font: {
+                                        weight: 600,
+                                    }
+                                }
+                            },
+                            y: {
+                                ticks: {
+                                    font: {
+                                        weight: 600,
+                                    }
+                                }
+                            }
+                        }
+                    }
                 });
             </script>
         </div>

django_smartbase_admin/templates/sb_admin/dashboard/list_widget.html

@@ -2,3 +2,9 @@
 
 {% block page_header %}{% endblock %}
 {% block tabulator_custom_header_controls %}{% endblock %}
+
+{% block content %}
+	<div id="{{ widget_id }}" class="col-span-12">
+        {{ block.super }}
+    </div>
+{% endblock %}

django_smartbase_admin/templates/sb_admin/dashboard/widget_base.html

@@ -3,7 +3,7 @@
     </form>
     
     {% block filters %}
-        <div class="flex max-sm:flex-wrap max-xs:py-16 sm:mb-24 gap-y-8 justify-between">
+        <div class="dashboard-filter flex max-sm:flex-wrap max-xs:pt-16 gap-y-8 justify-between col-span-12">
             <div class="min-w-0 sm:-mx-16 -my-12">
                 {% include 'sb_admin/components/filters.html' with filters=settings all_filters_visible=True default_button=True %}
             </div>

django_smartbase_admin/templates/sb_admin/filter_widgets/advanced_filters/date_field.html

@@ -1,8 +1,18 @@
-<input
-    type="text"
-    autocomplete="off"
-    class="input pl-10 js-datepicker-not-inline"
-    id="{{ filter_widget.input_id }}"
-    name="{{ filter_widget.input_name }}"
-    data-sbadmin-datepicker="{{ filter_widget.get_data }}"
->
+<div class="relative">
+    <input
+        type="hidden"
+        autocomplete="off"
+        id="{{ filter_widget.input_id }}"
+        name="{{ filter_widget.input_name }}"
+    >
+    <input
+        type="text"
+        autocomplete="off"
+        class="input pl-10 js-datepicker-dynamic"
+        id="{{ filter_widget.input_id }}_picker"
+        name="{{ filter_widget.input_name }}_picker"
+        data-sbadmin-datepicker-real-input-id="{{ filter_widget.input_id }}"
+        data-sbadmin-datepicker="{{ filter_widget.get_data }}"
+        data-sbadmin-datepicker-shortcuts-dict="{{ filter_widget.get_shortcuts_dict_data }}"
+    >
+</div>

django_smartbase_admin/templates/sb_admin/filter_widgets/advanced_filters/multiple_choice_field.html

@@ -7,7 +7,7 @@
             data-bs-auto-close="outside"
             class="btn !rounded px-10 font-normal w-full"
         >
-            <span id="{{ filter_widget.input_id }}-value" class="js-value"></span>
+            <span id="{{ filter_widget.input_id }}-value"></span>
             <svg class="ml-8">
                 <use xlink:href="#Down"></use>
             </svg>

django_smartbase_admin/templates/sb_admin/filter_widgets/advanced_filters/tree_select_filter.html

@@ -0,0 +1,2 @@
+{% include 'sb_admin/filter_widgets/tree_select_filter.html' %}
+

django_smartbase_admin/templates/sb_admin/filter_widgets/date_field.html

@@ -1,8 +1,22 @@
-<div class="dropdown-menu dropdown-menu-datepicker" style="max-width: none; width: auto; height: auto; max-height: none;">
+<div class="dropdown-menu dropdown-menu-datepicker"
+     style="max-width: none; width: auto; height: auto; max-height: none;">
     <div class="px-12 py-8">
-        <input form="{{ filter_widget.view_id }}-filter-form" type="text" class="input pl-10 js-datepicker-range"
-           id="{{ filter_widget.input_id }}" name="{{ filter_widget.input_name }}" data-sbadmin-datepicker="{{ filter_widget.get_data }}"
-           {% if not all_filters_visible %}disabled{% endif %}{% if filter_widget.get_default_value %} value="{{ filter_widget.get_default_value }}"{% endif %}>
+        <input
+            type="hidden"
+            autocomplete="off"
+            id="{{ filter_widget.input_id }}"
+            name="{{ filter_widget.input_name }}"
+            form="{{ filter_widget.view_id }}-filter-form"
+            {% if filter_widget.get_default_value %}value="{{ filter_widget.get_default_value }}" data-label="{{ filter_widget.get_default_label }}"{% endif %}
+            {% if not all_filters_visible %}disabled{% endif %}
+        >
+        <input type="text"
+               class="input pl-10 js-datepicker-range"
+               id="{{ filter_widget.input_id }}_picker"
+               name="{{ filter_widget.input_name }}_picker"
+               data-sbadmin-datepicker-real-input-id="{{ filter_widget.input_id }}"
+               data-sbadmin-datepicker="{{ filter_widget.get_data }}"
+               data-sbadmin-datepicker-shortcuts="{{ filter_widget.get_shortcuts_data }}">
     </div>
     {% include "sb_admin/filter_widgets/partials/clear.html" %}
 </div>

django_smartbase_admin/templates/sb_admin/filter_widgets/multiple_choice_field.html

@@ -6,6 +6,20 @@
                    {% if not all_filters_visible %}disabled{% endif %}{% if filter_widget.get_default_value %}
                    value="{{ filter_widget.get_default_value }}"{% endif %}>
     <ul class="relative py-8">
+        {% if filter_widget.enable_select_all %}
+            <li>
+                <div class="relative px-12 py-8">
+                    <input type="checkbox"
+                           value="{{ filter_widget.select_all_keyword }}"
+                           name="{{ filter_widget.input_name }}_dummy"
+                           class="checkbox js-simple-multiselect-all"
+                           id="{{ filter_widget.input_id }}_all" {% if filter_widget.get_default_value == filter_widget.select_all_keyword %} checked{% endif %} data-label="{{ filter_widget.select_all_label }}">
+                    <label for="{{ filter_widget.input_id }}_all">
+                        {{ filter_widget.select_all_label }}
+                    </label>
+                </div>
+            </li>
+        {% endif %}
         {% for choice in filter_widget.choices %}
             <li>
                 <div class="relative px-12 py-8">

django_smartbase_admin/templates/sb_admin/filter_widgets/partials/clear.html

@@ -8,9 +8,14 @@
             {% trans 'Remove' %}
         </button>
     {% endif %}
-    <button type="button"
-            class="text-primary ml-auto"
-            onclick="window.SBAdminTable['{{ view_id }}'].moduleInstances.filterModule.clearFilter('{{ filter_field.filter_field }}')">
-        {% trans 'Clear' %}
-    </button>
+        <button type="button"
+                class="text-primary ml-auto"
+                {% if view_id %}
+                onclick="window.SBAdminTable['{{ view_id }}'].moduleInstances.filterModule.clearFilter('{{ filter_field.filter_field }}')"
+                {% else %}
+                onclick="window.SBAdmin.clearFilter('{{ filter_field.filter_widget.input_id }}')"
+                {% endif %}
+        >
+            {% trans 'Clear' %}
+        </button>
 </div>

django_smartbase_admin/templates/sb_admin/filter_widgets/radio_choice_field.html

@@ -7,8 +7,8 @@
         {% for choice in filter_widget.choices %}
             <li>
                 <div class="relative">
-                    <input onchange="document.getElementById('{{ filter_widget.input_id }}').value = event.target.value;document.getElementById('{{ filter_widget.input_id }}').dispatchEvent(new Event('change'))" type="radio" value="{{ choice.0 }}" name="{{ filter_widget.input_name }}_dummy" class="radio" id="{{ filter_widget.input_id }}_{{ forloop.counter0 }}" {% if filter_widget.get_default_value == choice.0 %} checked{% endif %} data-label="{{ choice.1 }}">
-                    <label for="{{ filter_widget.input_id }}_{{ forloop.counter0 }}">
+                    <input onchange="document.getElementById('{{ filter_widget.input_id }}').value = event.target.value;document.getElementById('{{ filter_widget.input_id }}').dispatchEvent(new Event('change'))" type="radio" value="{{ choice.0 }}" name="{{ filter_widget.input_name }}_dummy" class="radio radio-list" id="{{ filter_widget.input_id }}_{{ choice.0 }}" {% if filter_widget.get_default_value == choice.0 %} checked{% endif %} data-label="{{ choice.1 }}">
+                    <label for="{{ filter_widget.input_id }}_{{ choice.0 }}">
                         {{ choice.1|safe }}
                     </label>
                 </div>