django-smartbase-admin 0.2.88__py3-none-any.whl → 0.2.90__py3-none-any.whl

django_smartbase_admin/admin/admin_base.py

@@ -652,7 +652,6 @@ class SBAdmin(
 ):
     change_list_template = "sb_admin/actions/list.html"
     change_form_template = "sb_admin/actions/change_form.html"
-    delete_confirmation_template = "sb_admin/actions/delete_confirmation.html"
     delete_selected_confirmation_template = (
         "sb_admin/actions/delete_selected_confirmation.html"
     )

django_smartbase_admin/engine/admin_base_view.py

@@ -49,6 +49,7 @@ class SBAdminBaseView(object):
     global_filter_data_map = None
     field_cache = None
     sbadmin_detail_actions = None
+    delete_confirmation_template = "sb_admin/actions/delete_confirmation.html"
 
     def init_view_static(self, configuration, model, admin_site):
         pass

django_smartbase_admin/engine/filter_widgets.py

@@ -308,13 +308,7 @@ class DateFilterWidget(SBAdminFilterWidget):
         return DATE_ATTRIBUTES
 
     def process_shortcut(self, shortcut, now):
-        return {
-            "label": shortcut["label"],
-            "value": [
-                now + timedelta(days=shortcut["value"][0]),
-                now + timedelta(days=shortcut["value"][1]),
-            ],
-        }
+        return shortcut
 
     def get_shortcuts(self):
         now = timezone.now()
@@ -332,12 +326,19 @@ class DateFilterWidget(SBAdminFilterWidget):
                 shortcuts[key].append(self.process_shortcut(shortcut, now))
         return shortcuts
 
+    def get_default_label(self):
+        if self.default_value_shortcut_index is not None:
+            return self.get_shortcuts()[self.default_value_shortcut_index]["label"]
+        return super().get_default_value()
+
     def get_default_value(self):
         if self.default_value_shortcut_index is not None:
             selected_shortcut_value = self.get_shortcuts()[
                 self.default_value_shortcut_index
             ]["value"]
-            return self.get_value_from_date_or_range(selected_shortcut_value)
+            return SBAdminViewService.json_dumps_for_url(
+                self.get_value_from_date_or_range(selected_shortcut_value)
+            )
         return super().get_default_value()
 
     def get_data(self):
@@ -379,12 +380,28 @@ class DateFilterWidget(SBAdminFilterWidget):
         if filter_value is None:
             return [None, None]
         date_format = cls.DATE_FORMAT
-        date_range = filter_value.split(cls.DATE_RANGE_SPLIT)
-        if len(date_range) == 2:
-            date_from = datetime.strptime(date_range[0], date_format)
-            date_to = datetime.strptime(date_range[1], date_format)
-            return [date_from, date_to]
-        else:
+        if type(filter_value) is list:
+            if type(filter_value[0]) is int:
+                return [
+                    timezone.now() + timedelta(days=filter_value[0]),
+                    timezone.now() + timedelta(days=filter_value[1]),
+                ]
+            return [
+                datetime.strptime(filter_value[0], date_format),
+                datetime.strptime(filter_value[1], date_format),
+            ]
+        try:
+            days_range = json.loads(filter_value)
+            return [
+                timezone.now() + timedelta(days=days_range[0]),
+                timezone.now() + timedelta(days=days_range[1]),
+            ]
+        except json.decoder.JSONDecodeError:
+            date_range = filter_value.split(cls.DATE_RANGE_SPLIT)
+            if len(date_range) == 2:
+                date_from = datetime.strptime(date_range[0], date_format)
+                date_to = datetime.strptime(date_range[1], date_format)
+                return [date_from, date_to]
             date_value = datetime.strptime(filter_value, date_format)
             return [date_value, date_value]
 
@@ -392,9 +409,11 @@ class DateFilterWidget(SBAdminFilterWidget):
     def get_value_from_date_or_range(cls, date_or_range):
         if not isinstance(date_or_range, list):
             return datetime.strftime(date_or_range, cls.DATE_FORMAT)
+        if type(date_or_range[0]) is int:
+            return date_or_range
         date_from = datetime.strftime(date_or_range[0], cls.DATE_FORMAT)
         date_to = datetime.strftime(date_or_range[1], cls.DATE_FORMAT)
-        return f"{date_from}{cls.DATE_RANGE_SPLIT}{date_to}"
+        return [date_from, date_to]
 
     def parse_value_from_input(self, request, filter_value):
         return self.get_range_from_value(filter_value)