fix: has_permission callback in template (#275)

Author: lukasvinclav

src/unfold/sites.py

@@ -234,10 +234,6 @@ def _get_is_active(link: str) -> bool:
             allowed_items = []
 
             for item in group["items"]:
-                # Skip item if permission check fails
-                if not self._call_permission_callback(item.get("permission"), request):
-                    continue
-
                 item["active"] = False
                 item["active"] = _get_is_active(item["link"])
 
@@ -260,6 +256,11 @@ def _get_is_active(link: str) -> bool:
                 if isinstance(item["link"], Callable):
                     item["link"] = item["link"](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:
@@ -283,9 +284,9 @@ def get_tabs_list(self, request: HttpRequest) -> List[Dict[str, Any]]:
             allowed_items = []
 
             for item in tab["items"]:
-                # Skip item if permission check fails
-                if not self._call_permission_callback(item.get("permission"), request):
-                    continue
+                item["has_permission"] = self._call_permission_callback(
+                    item.get("permission"), request
+                )
 
                 if isinstance(item["link"], Callable):
                     item["link"] = item["link"](request)

src/unfold/templates/unfold/helpers/app_list.html

@@ -16,26 +16,27 @@ <h3 class="font-medium my-3 px-6 text-gray-900 text-sm first:mt-0 dark:text-gray
 
                 <ol class="px-6">
                     {% for item in group.items %}
-                        <li>
-                            <a href="{{ item.link }}"
-                            class="border border-transparent flex h-11 items-center -mx-3 px-3 py-2 rounded-md {% if item.active %}bg-gray-100 font-semibold text-primary-600 dark:border dark:border-gray-800 dark:bg-white/[.02] dark:text-primary-500{% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200{% endif %}">
-                                {% if item.icon %}
-                                    <span class="material-symbols-outlined md-18 mr-3 w-4.5">
-                                        {{ item.icon }}
-                                    </span>
-                                {% endif %}
-
-                                <span class="text-sm">
-                                    {{ item.title|safe }}
-                                </span>
+                        {% if item.has_permission %}
+                            <li>
+                                <a href="{{ item.link }}" class="border border-transparent flex h-11 items-center -mx-3 px-3 py-2 rounded-md {% if item.active %}bg-gray-100 font-semibold text-primary-600 dark:border dark:border-gray-800 dark:bg-white/[.02] dark:text-primary-500{% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 hover:dark:text-gray-200{% endif %}">
+                                    {% if item.icon %}
+                                        <span class="material-symbols-outlined md-18 mr-3 w-4.5">
+                                            {{ item.icon }}
+                                        </span>
+                                    {% endif %}
 
-                                {% if item.badge %}
-                                    <span class="bg-red-600 font-semibold ml-2 px-1 rounded-sm text-xs text-white">
-                                        {{ item.badge|safe }}
+                                    <span class="text-sm">
+                                        {{ item.title|safe }}
                                     </span>
-                                {% endif %}
-                            </a>
-                        </li>
+
+                                    {% if item.badge %}
+                                        <span class="bg-red-600 font-semibold ml-2 px-1 rounded-sm text-xs text-white">
+                                            {{ item.badge|safe }}
+                                        </span>
+                                    {% endif %}
+                                </a>
+                            </li>
+                        {% endif %}
                     {% endfor %}
                 </ol>
             {% endif %}

src/unfold/templates/unfold/helpers/tab_list.html

@@ -4,11 +4,13 @@
             {% if tab_list %}
                 <ul class="border rounded-md flex flex-col w-full md:flex-row md:border-b-0 md:border-t-0 md:border-l-0 md:border-r-0 dark:border-gray-800">
                     {% for item in tab_list %}
-                        <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
-                            <a href="{{ item.link }}" class="block px-3 py-2 {% if item.link|stringformat:"s" in request.path %} border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500{% else %} hover:text-gray-700 dark:hover:text-gray-200{% endif %} md:py-4 md:px-0 dark:border-gray-800">
-                                {{ item.title }}
-                            </a>
-                        </li>
+                        {% if item.has_permission %}
+                            <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-gray-800">
+                                <a href="{{ item.link }}" class="block px-3 py-2 {% if item.link|stringformat:"s" in request.path %} border-b md:border-primary-500 dark:md:border-primary-600 font-medium -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500{% else %} hover:text-gray-700 dark:hover:text-gray-200{% endif %} md:py-4 md:px-0 dark:border-gray-800">
+                                    {{ item.title }}
+                                </a>
+                            </li>
+                        {% endif %}
                     {% endfor %}
                 </ul>
             {% endif %}

tests/test_navigations.py

@@ -36,7 +36,7 @@ def test_check_tab_lambda_deny_permission(self):
         admin_site = UnfoldAdminSite()
         request = RequestFactory().get("/rand")
         tabs = admin_site.get_tabs_list(request)
-        self.assertEqual(len(tabs[0]["items"]), 0)
+        self.assertFalse(tabs[0]["items"][0]["has_permission"])
 
     @override_settings(
         UNFOLD={
@@ -60,7 +60,7 @@ def test_check_tab_lambda_allow_permission(self):
         admin_site = UnfoldAdminSite()
         request = RequestFactory().get("/rand")
         tabs = admin_site.get_tabs_list(request)
-        self.assertEqual(len(tabs[0]["items"]), 1)
+        self.assertTrue(tabs[0]["items"][0]["has_permission"])
 
     @override_settings(
         UNFOLD={
@@ -84,7 +84,7 @@ def test_check_tab_path_deny_permission(self):
         admin_site = UnfoldAdminSite()
         request = RequestFactory().get("/rand")
         tabs = admin_site.get_tabs_list(request)
-        self.assertEqual(len(tabs[0]["items"]), 0)
+        self.assertFalse(tabs[0]["items"][0]["has_permission"])
 
     @override_settings(
         UNFOLD={
@@ -108,4 +108,4 @@ def test_check_tab_path_allow_permission(self):
         admin_site = UnfoldAdminSite()
         request = RequestFactory().get("/rand")
         tabs = admin_site.get_tabs_list(request)
-        self.assertEqual(len(tabs[0]["items"]), 1)
+        self.assertTrue(tabs[0]["items"][0]["has_permission"])