django-advanced-report-builder 0.9.5__tar.gz → 0.9.7__tar.gz

{django_advanced_report_builder-0.9.5/django_advanced_report_builder.egg-info → django_advanced_report_builder-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.5
+Version: 0.9.7
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

django_advanced_report_builder-0.9.7/advanced_report_builder/templates/advanced_report_builder/extra_query_modal.html

@@ -0,0 +1,13 @@
+{% extends 'django_modals/modal_formset_base.html' %}
+
+{% block javascript %}
+<script>
+
+function save_modal_{{ form.form_id }}() {
+    id_query.save_query_builder();
+    id_extra_query.save_query_builder();
+    django_modal.process_commands_lock([{'function': 'post_modal'}]);
+}
+</script>
+{% endblock %}
+

{django_advanced_report_builder-0.9.5 → django_advanced_report_builder-0.9.7}/advanced_report_builder/views/datatables/modal.py

@@ -233,7 +233,7 @@ class TableFieldForm(ChartBaseFieldForm):
         return self.button('Cancel', commands, css_class, **kwargs)
 
     def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        if self.django_field is not None and isinstance(self.django_field, NUMBER_FIELDS | CURRENCY_COLUMNS):
+        if self.django_field is not None and isinstance(self.django_field, NUMBER_FIELDS + CURRENCY_COLUMNS):
             return StrictButton(
                 button_text,
                 onclick=f'save_modal_{self.form_id}()',

{django_advanced_report_builder-0.9.5 → django_advanced_report_builder-0.9.7/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.5
+Version: 0.9.7
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

{django_advanced_report_builder-0.9.5 → django_advanced_report_builder-0.9.7}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -123,6 +123,7 @@ advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugin
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/filter-description.scss
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/invert.scss
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/sortable.scss
+advanced_report_builder/templates/advanced_report_builder/extra_query_modal.html
 advanced_report_builder/templates/advanced_report_builder/query_builder.html
 advanced_report_builder/templates/advanced_report_builder/query_modal.html
 advanced_report_builder/templates/advanced_report_builder/select_column.html

{django_advanced_report_builder-0.9.5 → django_advanced_report_builder-0.9.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-advanced-report-builder",
-    version="0.9.5",
+    version="0.9.7",
     author="Thomas Turner",
     description="Django app that allows you to build reports from modals",
     long_description=long_description,