django-unfold 0.57.0__py3-none-any.whl → 0.59.0__py3-none-any.whl

unfold/sites.py

@@ -102,6 +102,13 @@ class UnfoldAdminSite(AdminSite):
             "environment_title_prefix": self._get_config(
                 "ENVIRONMENT_TITLE_PREFIX", request
             ),
+            "languages_list": self._get_value(
+                self._get_config("LANGUAGES", request).get("navigation"), request
+            ),
+            "languages_action": self._get_value(
+                self._get_config("LANGUAGES", request).get("action"), request
+            ),
+            "account_links": self._get_account_links(request),
             "tab_list": self.get_tabs_list(request),
             "styles": self._get_list("STYLES", request),
             "scripts": self._get_list("SCRIPTS", request),
@@ -243,58 +250,75 @@ class UnfoldAdminSite(AdminSite):
         results = []
 
         for group in copy.deepcopy(navigation):
-            allowed_items = []
+            group["items"] = self._get_navigation_items(request, group["items"], tabs)
+            results.append(group)
 
-            for item in group["items"]:
-                if "active" in item:
-                    item["active"] = self._get_value(item["active"], request)
-                else:
-                    item["active"] = self._get_is_active(
-                        request, item.get("link_callback") or item["link"]
-                    )
+        return results
 
-                # Checks if any tab item is active and then marks the sidebar link as active
-                for tab in tabs:
-                    has_primary_link = False
-                    has_tab_link_active = False
+    def _get_navigation_items(
+        self, request: HttpRequest, items: list[dict], tabs: list[dict] = None
+    ) -> list:
+        allowed_items = []
 
-                    for tab_item in tab["items"]:
-                        if item["link"] == tab_item["link"]:
-                            has_primary_link = True
-                            continue
+        for item in items:
+            link = item.get("link")
 
-                        if self._get_is_active(
-                            request, tab_item.get("link_callback") or tab_item["link"]
-                        ):
-                            has_tab_link_active = True
-                            break
+            if "active" in item:
+                item["active"] = self._get_value(item["active"], request)
+            else:
+                item["active"] = self._get_is_active(
+                    request, item.get("link_callback") or link
+                )
 
-                    if has_primary_link and has_tab_link_active:
-                        item["active"] = True
+            # Checks if any tab item is active and then marks the sidebar link as active
+            if (
+                tabs
+                and (is_active := self._get_is_tab_active(request, tabs, link))
+                and is_active
+            ):
+                item["active"] = True
 
-                if isinstance(item["link"], Callable):
-                    item["link_callback"] = lazy(item["link"])(request)
+            # Link callback
+            if isinstance(link, Callable):
+                item["link_callback"] = lazy(link)(request)
 
-                # Permission callback
-                item["has_permission"] = self._call_permission_callback(
-                    item.get("permission"), request
-                )
+            # Permission callback
+            item["has_permission"] = self._call_permission_callback(
+                item.get("permission"), request
+            )
 
-                # Badge callbacks
-                if "badge" in item and isinstance(item["badge"], str):
-                    try:
-                        callback = import_string(item["badge"])
-                        item["badge_callback"] = lazy(callback)(request)
-                    except ImportError:
-                        pass
+            # Badge callbacks
+            if "badge" in item and isinstance(item["badge"], str):
+                try:
+                    callback = import_string(item["badge"])
+                    item["badge_callback"] = lazy(callback)(request)
+                except ImportError:
+                    pass
 
-                allowed_items.append(item)
+            # Process nested items
+            if "items" in item:
+                item["items"] = self._get_navigation_items(request, item["items"])
 
-            group["items"] = allowed_items
+            allowed_items.append(item)
 
-            results.append(group)
+        return allowed_items
 
-        return results
+    def _get_account_links(self, request: HttpRequest) -> list[dict[str, Any]]:
+        links = []
+
+        navigation = self._get_value(
+            get_config(self.settings_name)["ACCOUNT"].get("navigation"), request
+        )
+
+        for item in navigation:
+            links.append(
+                {
+                    "title": self._get_value(item["title"], request),
+                    "link": self._get_value(item["link"], request),
+                }
+            )
+
+        return links
 
     def get_tabs_list(self, request: HttpRequest) -> list[dict[str, Any]]:
         tabs = copy.deepcopy(self._get_config("TABS", request))
@@ -381,6 +405,29 @@ class UnfoldAdminSite(AdminSite):
 
         return False
 
+    def _get_is_tab_active(
+        self, request: HttpRequest, tabs: list[dict], link: str
+    ) -> bool:
+        for tab in tabs:
+            has_primary_link = False
+            has_tab_link_active = False
+
+            for tab_item in tab["items"]:
+                if link == tab_item["link"]:
+                    has_primary_link = True
+                    continue
+
+                if self._get_is_active(
+                    request, tab_item.get("link_callback") or tab_item["link"]
+                ):
+                    has_tab_link_active = True
+                    break
+
+            if has_primary_link and has_tab_link_active:
+                return True
+
+        return False
+
     def _get_config(self, key: str, *args) -> Any:
         config = get_config(self.settings_name)
 

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

@@ -74,9 +74,15 @@
 
   function updateRelatedObjectLinks(triggeringLink) {
     const $this = $(triggeringLink);
-    const siblings = $this.nextAll(
-      ".view-related, .change-related, .delete-related"
-    );
+    // !CHANGED from original
+    // const siblings = $this.nextAll(
+    //   ".view-related, .change-related, .delete-related"
+    // );
+
+    const siblings = $this
+      .parent()
+      .nextAll(".view-related, .change-related, .delete-related");
+
     if (!siblings.length) {
       return;
     }