django-unfold 0.66.0__tar.gz → 0.67.0__tar.gz

{django_unfold-0.66.0 → django_unfold-0.67.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unfold
-Version: 0.66.0
+Version: 0.67.0
 Summary: Modern Django admin theme for seamless interface development
 License: MIT
 License-File: LICENSE.md

{django_unfold-0.66.0 → django_unfold-0.67.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.66.0"
+version = "0.67.0"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"

{django_unfold-0.66.0 → django_unfold-0.67.0}/src/unfold/contrib/filters/admin/numeric_filters.py

@@ -179,6 +179,8 @@ class SliderNumericFilter(RangeNumericFilter):
                 ),
                 "form": self.form_class(
                     name=self.parameter_name,
+                    min=min_value,
+                    max=max_value,
                     data={
                         self.parameter_name + "_from": self.used_parameters.get(
                             self.parameter_name + "_from", min_value

{django_unfold-0.66.0 → django_unfold-0.67.0}/src/unfold/contrib/filters/forms.py

@@ -59,7 +59,11 @@ class AutocompleteDropdownForm(forms.Form):
             label=label,
             required=False,
             queryset=field.remote_field.model.objects,
-            widget=self.widget(field, model_admin.admin_site),
+            widget=self.widget(
+                field,
+                model_admin.admin_site,
+                attrs={"class": "unfold-filter-autocomplete"},
+            ),
         )
 
     class Media:
@@ -175,22 +179,39 @@ class SingleNumericForm(forms.Form):
 
 
 class RangeNumericForm(forms.Form):
-    def __init__(self, name: str, *args, **kwargs) -> None:
+    def __init__(
+        self, name: str, min: float = None, max: float = None, *args, **kwargs
+    ) -> None:
         self.name = name
         super().__init__(*args, **kwargs)
 
+        min_max = {}
+
+        if min:
+            min_max["min"] = min
+        if max:
+            min_max["max"] = max
+
         self.fields[self.name + "_from"] = forms.FloatField(
             label="",
             required=False,
             widget=forms.NumberInput(
-                attrs={"placeholder": _("From"), "class": " ".join(INPUT_CLASSES)}
+                attrs={
+                    "placeholder": _("From"),
+                    "class": " ".join(INPUT_CLASSES),
+                    **min_max,
+                }
             ),
         )
         self.fields[self.name + "_to"] = forms.FloatField(
             label="",
             required=False,
             widget=forms.NumberInput(
-                attrs={"placeholder": _("To"), "class": " ".join(INPUT_CLASSES)}
+                attrs={
+                    "placeholder": _("To"),
+                    "class": " ".join(INPUT_CLASSES),
+                    **min_max,
+                }
             ),
         )
 

django_unfold-0.67.0/src/unfold/contrib/filters/static/unfold/filters/js/admin-numeric-filter.js

@@ -0,0 +1,69 @@
+document.addEventListener("DOMContentLoaded", function () {
+  Array.from(
+    document.getElementsByClassName("admin-numeric-filter-slider")
+  ).forEach(function (slider) {
+    if (Array.from(slider.classList).includes("noUi-target")) {
+      return;
+    }
+
+    const fromInput = slider
+      .closest(".admin-numeric-filter-wrapper")
+      .querySelectorAll(".admin-numeric-filter-wrapper-group input")[0];
+
+    const toInput = slider
+      .closest(".admin-numeric-filter-wrapper")
+      .querySelectorAll(".admin-numeric-filter-wrapper-group input")[1];
+
+    noUiSlider.create(slider, {
+      start: [parseFloat(fromInput.value), parseFloat(toInput.value)],
+      step: parseFloat(slider.getAttribute("data-step")),
+      connect: true,
+      format: wNumb({
+        decimals: parseFloat(slider.getAttribute("data-decimals")),
+      }),
+      range: {
+        min: parseFloat(slider.getAttribute("data-min")),
+        max: parseFloat(slider.getAttribute("data-max")),
+      },
+    });
+
+    /*************************************************************
+     * Update slider when input values change
+     *************************************************************/
+    fromInput.addEventListener("keyup", function () {
+      clearTimeout(this._sliderUpdateTimeout);
+      this._sliderUpdateTimeout = setTimeout(() => {
+        slider.noUiSlider.set([
+          parseFloat(this.value),
+          parseFloat(toInput.value),
+        ]);
+      }, 500);
+    });
+
+    toInput.addEventListener("keyup", function () {
+      clearTimeout(this._sliderUpdateTimeout);
+      this._sliderUpdateTimeout = setTimeout(() => {
+        slider.noUiSlider.set([
+          parseFloat(fromInput.value),
+          parseFloat(this.value),
+        ]);
+      }, 500);
+    });
+
+    /*************************************************************
+     * Updated inputs when slider is moved
+     *************************************************************/
+    slider.noUiSlider.on("update", function (values, handle) {
+      const parent = this.target.closest(".admin-numeric-filter-wrapper");
+      const from = parent.querySelectorAll(
+        ".admin-numeric-filter-wrapper-group input"
+      )[0];
+      const to = parent.querySelectorAll(
+        ".admin-numeric-filter-wrapper-group input"
+      )[1];
+
+      from.value = values[0];
+      to.value = values[1];
+    });
+  });
+});

{django_unfold-0.66.0 → django_unfold-0.67.0}/src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_slider.html

@@ -8,22 +8,13 @@
         </h3>
 
         {% if choice.min is not None and choice.max is not None and choice.step %}
-            <div class="admin-numeric-filter-slider-tooltips">
-                <span class="admin-numeric-filter-slider-tooltip-from border border-base-200 cursor-not-allowed flex grow flex-row items-center mr-auto rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
-                    {{ choice.value_from }}
-                </span>
 
-                <span class="admin-numeric-filter-slider-tooltip-to border border-base-200 cursor-not-allowed flex grow flex-row items-center rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
-                    {{ choice.value_to }}
-                </span>
+            <div class="admin-numeric-filter-wrapper-group flex flex-row gap-4 mb-4">
+                {{ choice.form.as_p }}
             </div>
 
             <div class="admin-numeric-filter-slider" data-min="{{ choice.min|unlocalize }}" data-max="{{ choice.max|unlocalize }}" data-decimals="{{ choice.decimals }}" data-step="{{ choice.step|unlocalize }}">
             </div>
-
-            <div class="admin-numeric-filter-wrapper-group hidden">
-                {{ choice.form.as_p }}
-            </div>
         {% else %}
             <div class="admin-numeric-filter-slider-error dark:text-font-default-dark">
                 <p class="border border-base-300 border-dashed leading-[36px] h-[38px] rounded-default text-center dark:border-base-700">

{django_unfold-0.66.0 → django_unfold-0.67.0}/src/unfold/fields.py

@@ -1,8 +1,11 @@
+from typing import Union
+
 from django.contrib.admin import helpers
 from django.contrib.admin.utils import lookup_field, quote
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.models import (
+    FileField,
     ForeignObjectRel,
     ImageField,
     JSONField,
@@ -36,6 +39,30 @@ class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
 
         return format_html("<label{}>{}</label>", flatatt(attrs), capfirst(label))
 
+    @property
+    def url(self) -> Union[str, bool]:
+        field, obj, model_admin = (
+            self.field["field"],
+            self.form.instance,
+            self.model_admin,
+        )
+
+        try:
+            f, attr, value = lookup_field(field, obj, model_admin)
+        except (AttributeError, ValueError, ObjectDoesNotExist):
+            return False
+
+        if not self.is_file():
+            return False
+
+        if hasattr(obj, field):
+            field_value = getattr(obj, field)
+
+            if field_value and hasattr(field_value, "url"):
+                return field_value.url
+
+        return False
+
     def is_json(self) -> bool:
         field, obj, model_admin = (
             self.field["field"],
@@ -73,6 +100,20 @@ class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
 
         return isinstance(f, ImageField)
 
+    def is_file(self) -> bool:
+        field, obj, model_admin = (
+            self.field["field"],
+            self.form.instance,
+            self.model_admin,
+        )
+
+        try:
+            f, attr, value = lookup_field(field, obj, model_admin)
+        except (AttributeError, ValueError, ObjectDoesNotExist):
+            return False
+
+        return isinstance(f, (ImageField, FileField))
+
     def contents(self) -> str:
         contents = self._get_contents()
         contents = self._preprocess_field(contents)