django-unfold 0.37.0__py3-none-any.whl → 0.39.0__py3-none-any.whl

unfold/contrib/simple_history/templates/simple_history/object_history_list.html

@@ -4,35 +4,35 @@
 {% load getattribute from getattributes %}
 
 <table id="change-history" class="border-gray-200 border-spacing-none border-separate mb-6 w-full lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
-    <thead class="hidden text-gray-900 lg:table-header-group dark:text-gray-100">
+    <thead class="hidden text-font-important-light lg:table-header-group dark:text-font-important-dark">
         <tr>
-            <th class="align-middle font-medium px-3 py-2 text-left ">
+            <th class="align-middle font-semibold px-3 py-2 text-left ">
                 {% trans 'Object' %}
             </th>
 
             {% for column in history_list_display %}
-                <th class="align-middle font-medium px-3 py-2 text-left ">
+                <th class="align-middle font-semibold px-3 py-2 text-left ">
                     {% trans column %}
                 </th>
             {% endfor %}
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Date/time' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Comment' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Changed by' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Change reason' %}
             </th>
 
-            <th class="align-middle font-medium px-3 py-2 text-left">
+            <th class="align-middle font-semibold px-3 py-2 text-left">
                 {% trans 'Changes' %}
             </th>
         </tr>

unfold/contrib/simple_history/templates/simple_history/submit_line.html

@@ -16,7 +16,7 @@
                     </button>
                 {% endif %}
 
-                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-gray-300 dark:hover:text-gray-200 dark:hover:bg-gray-900">
+                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-font-default-dark dark:hover:text-gray-200 dark:hover:bg-gray-900">
                     {% trans 'Close' %}
                 </a>
             </div>

unfold/forms.py

@@ -10,9 +10,13 @@ from django.contrib.admin.forms import (
 from django.contrib.auth.forms import (
     AdminPasswordChangeForm as BaseAdminPasswordChangeForm,
 )
+
+try:
+    from django.contrib.auth.forms import AdminUserCreationForm as BaseUserCreationForm
+except ImportError:
+    from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
 from django.contrib.auth.forms import UserChangeForm as BaseUserChangeForm
-from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
 from django.http import HttpRequest
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _

unfold/settings.py

@@ -1,3 +1,5 @@
+from typing import Any, Dict
+
 from django.conf import settings
 
 CONFIG_DEFAULTS = {
@@ -11,6 +13,14 @@ CONFIG_DEFAULTS = {
     "SHOW_HISTORY": True,
     "SHOW_VIEW_ON_SITE": True,
     "COLORS": {
+        "font": {
+            "subtle-light": "107 114 128",  # text-gray-500
+            "subtle-dark": "156 163 175",  # text-gray-400
+            "default-light": "75 85 99",  # text-gray-600
+            "default-dark": "209 213 219",  # text-gray-300
+            "important-light": "17 24 39",  # text-gray-900
+            "important-dark": "243 244 246",  # text-gray-100
+        },
         "primary": {
             "50": "250 245 255",
             "100": "243 232 255",
@@ -47,4 +57,19 @@ def get_config(settings_name=None):
     if settings_name is None:
         settings_name = "UNFOLD"
 
-    return {**CONFIG_DEFAULTS, **getattr(settings, settings_name, {})}
+    def merge_dicts(dict1: Dict[str, Any], dict2: Dict[str, Any]) -> Dict[str, Any]:
+        result = dict1.copy()
+
+        for key, value in dict2.items():
+            if (
+                key in result
+                and isinstance(result[key], dict)
+                and isinstance(value, dict)
+            ):
+                result[key] = merge_dicts(result[key], value)
+            else:
+                result[key] = value
+
+        return result
+
+    return merge_dicts(CONFIG_DEFAULTS, getattr(settings, settings_name, {}))

unfold/static/admin/js/admin/RelatedObjectLookups.js

@@ -0,0 +1,295 @@
+/*global SelectBox, interpolate*/
+// Handles related-objects functionality: lookup link for raw_id_fields
+// and Add Another links.
+"use strict";
+{
+  const $ = django.jQuery;
+  let popupIndex = 0;
+  const relatedWindows = [];
+
+  function dismissChildPopups() {
+    relatedWindows.forEach(function (win) {
+      if (!win.closed) {
+        win.dismissChildPopups();
+        win.close();
+      }
+    });
+  }
+
+  function setPopupIndex() {
+    if (document.getElementsByName("_popup").length > 0) {
+      const index = window.name.lastIndexOf("__") + 2;
+      popupIndex = parseInt(window.name.substring(index));
+    } else {
+      popupIndex = 0;
+    }
+  }
+
+  function addPopupIndex(name) {
+    return name + "__" + (popupIndex + 1);
+  }
+
+  function removePopupIndex(name) {
+    return name.replace(new RegExp("__" + (popupIndex + 1) + "$"), "");
+  }
+
+  function showAdminPopup(triggeringLink, name_regexp, add_popup) {
+    const name = addPopupIndex(triggeringLink.id.replace(name_regexp, ""));
+    const href = new URL(triggeringLink.href);
+    if (add_popup) {
+      href.searchParams.set("_popup", 1);
+    }
+    const win = window.open(
+      href,
+      name,
+      "height=768,width=1024,resizable=yes,scrollbars=yes"
+    );
+    relatedWindows.push(win);
+    win.focus();
+    return false;
+  }
+
+  function showRelatedObjectLookupPopup(triggeringLink) {
+    return showAdminPopup(triggeringLink, /^lookup_/, true);
+  }
+
+  function dismissRelatedLookupPopup(win, chosenId) {
+    const name = removePopupIndex(win.name);
+    const elem = document.getElementById(name);
+    if (elem.classList.contains("vManyToManyRawIdAdminField") && elem.value) {
+      elem.value += "," + chosenId;
+    } else {
+      document.getElementById(name).value = chosenId;
+    }
+    const index = relatedWindows.indexOf(win);
+    if (index > -1) {
+      relatedWindows.splice(index, 1);
+    }
+    win.close();
+  }
+
+  function showRelatedObjectPopup(triggeringLink) {
+    return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false);
+  }
+
+  function updateRelatedObjectLinks(triggeringLink) {
+    const $this = $(triggeringLink);
+    const siblings = $this.nextAll(
+      ".view-related, .change-related, .delete-related"
+    );
+    if (!siblings.length) {
+      return;
+    }
+    const value = $this.val();
+    if (value) {
+      siblings.each(function () {
+        const elm = $(this);
+        elm.attr(
+          "href",
+          elm.attr("data-href-template").replace("__fk__", value)
+        );
+        elm.removeAttr("aria-disabled");
+      });
+    } else {
+      siblings.removeAttr("href");
+      siblings.attr("aria-disabled", true);
+    }
+  }
+
+  function updateRelatedSelectsOptions(
+    currentSelect,
+    win,
+    objId,
+    newRepr,
+    newId,
+    skipIds = []
+  ) {
+    // After create/edit a model from the options next to the current
+    // select (+ or :pencil:) update ForeignKey PK of the rest of selects
+    // in the page.
+
+    const path = win.location.pathname;
+    // Extract the model from the popup url '.../<model>/add/' or
+    // '.../<model>/<id>/change/' depending the action (add or change).
+    const modelName = path.split("/")[path.split("/").length - (objId ? 4 : 3)];
+    // Select elements with a specific model reference and context of "available-source".
+    const selectsRelated = document.querySelectorAll(
+      `[data-model-ref="${modelName}"] [data-context="available-source"]`
+    );
+
+    selectsRelated.forEach(function (select) {
+      if (
+        currentSelect === select ||
+        (skipIds && skipIds.includes(select.id))
+      ) {
+        return;
+      }
+
+      let option = select.querySelector(`option[value="${objId}"]`);
+
+      if (!option) {
+        option = new Option(newRepr, newId);
+        select.options.add(option);
+        // Update SelectBox cache for related fields.
+        if (
+          window.SelectBox !== undefined &&
+          !SelectBox.cache[currentSelect.id]
+        ) {
+          SelectBox.add_to_cache(select.id, option);
+          SelectBox.redisplay(select.id);
+        }
+        return;
+      }
+
+      option.textContent = newRepr;
+      option.value = newId;
+    });
+  }
+
+  function dismissAddRelatedObjectPopup(win, newId, newRepr) {
+    const name = removePopupIndex(win.name);
+    const elem = document.getElementById(name);
+    if (elem) {
+      const elemName = elem.nodeName.toUpperCase();
+      if (elemName === "SELECT") {
+        elem.options[elem.options.length] = new Option(
+          newRepr,
+          newId,
+          true,
+          true
+        );
+        updateRelatedSelectsOptions(elem, win, null, newRepr, newId);
+      } else if (elemName === "INPUT") {
+        if (
+          elem.classList.contains("vManyToManyRawIdAdminField") &&
+          elem.value
+        ) {
+          elem.value += "," + newId;
+        } else {
+          elem.value = newId;
+        }
+      }
+      // Trigger a change event to update related links if required.
+      $(elem).trigger("change");
+    } else {
+      const toId = name + "_to";
+      const toElem = document.getElementById(toId);
+      const o = new Option(newRepr, newId);
+      SelectBox.add_to_cache(toId, o);
+      SelectBox.redisplay(toId);
+      if (toElem && toElem.nodeName.toUpperCase() === "SELECT") {
+        const skipIds = [name + "_from"];
+        updateRelatedSelectsOptions(toElem, win, null, newRepr, newId, skipIds);
+      }
+    }
+    const index = relatedWindows.indexOf(win);
+    if (index > -1) {
+      relatedWindows.splice(index, 1);
+    }
+    win.close();
+  }
+
+  function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
+    const id = removePopupIndex(win.name.replace(/^edit_/, ""));
+    const selectsSelector = interpolate("#%s, #%s_from, #%s_to", [id, id, id]);
+    const selects = $(selectsSelector);
+    selects
+      .find("option")
+      .each(function () {
+        if (this.value === objId) {
+          this.textContent = newRepr;
+          this.value = newId;
+        }
+      })
+      .trigger("change");
+    updateRelatedSelectsOptions(selects[0], win, objId, newRepr, newId);
+    selects
+      .next()
+      .find(".select2-selection__rendered")
+      .each(function () {
+        // The element can have a clear button as a child.
+        // Use the lastChild to modify only the displayed value.
+        this.lastChild.textContent = newRepr;
+        this.title = newRepr;
+      });
+    const index = relatedWindows.indexOf(win);
+    if (index > -1) {
+      relatedWindows.splice(index, 1);
+    }
+    win.close();
+  }
+
+  function dismissDeleteRelatedObjectPopup(win, objId) {
+    const id = removePopupIndex(win.name.replace(/^delete_/, ""));
+    const selectsSelector = interpolate("#%s, #%s_from, #%s_to", [id, id, id]);
+    const selects = $(selectsSelector);
+    selects
+      .find("option")
+      .each(function () {
+        if (this.value === objId) {
+          $(this).remove();
+        }
+      })
+      .trigger("change");
+    const index = relatedWindows.indexOf(win);
+    if (index > -1) {
+      relatedWindows.splice(index, 1);
+    }
+    win.close();
+  }
+
+  window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup;
+  window.dismissRelatedLookupPopup = dismissRelatedLookupPopup;
+  window.showRelatedObjectPopup = showRelatedObjectPopup;
+  window.updateRelatedObjectLinks = updateRelatedObjectLinks;
+  window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup;
+  window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup;
+  window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup;
+  window.dismissChildPopups = dismissChildPopups;
+
+  // Kept for backward compatibility
+  window.showAddAnotherPopup = showRelatedObjectPopup;
+  window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup;
+
+  window.addEventListener("unload", function (evt) {
+    window.dismissChildPopups();
+  });
+
+  $(document).ready(function () {
+    setPopupIndex();
+    $("a[data-popup-opener]").on("click", function (event) {
+      event.preventDefault();
+      opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener"));
+    });
+    $("body").on(
+      "click",
+      '.related-widget-wrapper-link[data-popup="yes"]',
+      function (e) {
+        e.preventDefault();
+        if (this.href) {
+          const event = $.Event("django:show-related", { href: this.href });
+          $(this).trigger(event);
+          if (!event.isDefaultPrevented()) {
+            showRelatedObjectPopup(this);
+          }
+        }
+      }
+    );
+    $("body").on("change", ".related-widget-wrapper select", function (e) {
+      const event = $.Event("django:update-related");
+      $(this).trigger(event);
+      if (!event.isDefaultPrevented()) {
+        updateRelatedObjectLinks(this);
+      }
+    });
+    $(".related-widget-wrapper select").trigger("change");
+    $("body").on("click", ".related-lookup", function (e) {
+      e.preventDefault();
+      const event = $.Event("django:lookup-related");
+      $(this).trigger(event);
+      if (!event.isDefaultPrevented()) {
+        showRelatedObjectLookupPopup(this);
+      }
+    });
+  });
+}