Merge branch 'develop' into issue-160

fiesta/apps/buddy_system/apps.py

@@ -10,6 +10,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models import Plugin
 
 
 class BuddySystemConfig(PluginAppConfig):
@@ -26,8 +27,8 @@ class BuddySystemConfig(PluginAppConfig):
 
     membership_not_required_urls = ("new-request",)
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
-        base = super().as_navigation_item(request)
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
+        base = super().as_navigation_item(request, bound_plugin)
         if not request.membership.is_privileged:
             return base
 

fiesta/apps/dashboard/apps.py

@@ -9,6 +9,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models.plugin import Plugin
 
 
 class DashboardConfig(PluginAppConfig):
@@ -18,7 +19,7 @@ class DashboardConfig(PluginAppConfig):
 
     configuration_model = "dashboard.DashboardConfiguration"
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
         # do not display in menu, since it's the home button link if the plugin is enabled
         return None
 

fiesta/apps/esncards/apps.py

@@ -10,6 +10,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models import Plugin
 
 
 class ESNcardsConfig(PluginAppConfig):
@@ -20,8 +21,8 @@ class ESNcardsConfig(PluginAppConfig):
 
     verbose_name = _("ESNcard")
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
-        base = super().as_navigation_item(request)
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
+        base = super().as_navigation_item(request, bound_plugin)
         if not request.membership.is_privileged:
             return base
 

fiesta/apps/pages/apps.py

@@ -8,6 +8,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models.plugin import Plugin
     from apps.utils.templatetags.navigation import NavigationItemSpec
 
 
@@ -25,7 +26,7 @@ class PagesConfig(PluginAppConfig):
     def url_prefix(self) -> str:
         return "_/"
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
         return None
 
 

fiesta/apps/plugins/plugin.py

@@ -13,6 +13,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models.plugin import Plugin
 
 
 class PluginAppConfig(AppConfig, metaclass=ABCMeta):
@@ -65,7 +66,7 @@ def url_prefix(self) -> str:
         """Defines prefix, under which are all urls included."""
         return self.label.replace("_", "-") + "/"
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
         return NavigationItemSpec(
             self.verbose_name,
             f"/{self.url_prefix}",

fiesta/apps/sections/apps.py

@@ -10,6 +10,7 @@
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
+    from apps.plugins.models import Plugin
 
 
 class SectionsConfig(PluginAppConfig):
@@ -24,11 +25,11 @@ class SectionsConfig(PluginAppConfig):
         "choose-space",
     ]
 
-    def as_navigation_item(self, request: HttpRequest) -> NavigationItemSpec | None:
+    def as_navigation_item(self, request: HttpRequest, bound_plugin: Plugin) -> NavigationItemSpec | None:
         if request.membership.is_privileged:
             return (
                 super()
-                .as_navigation_item(request)
+                .as_navigation_item(request, bound_plugin)
                 ._replace(
                     url="",
                     children=[

fiesta/apps/utils/templatetags/navigation.py

@@ -8,6 +8,7 @@
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
     from apps.plugins.models import Plugin
+    from apps.plugins.plugin import PluginAppConfig
     from apps.sections.models import Section, SectionMembership
 
 register = template.Library()
@@ -28,24 +29,18 @@ def get_navigation_items(context):
     membership: SectionMembership | None = request.membership
     section: Section | None = request.in_space_of_section
 
-    items = []
-
     if not membership:
-        return items
+        return []
 
     plugins: list[Plugin] = (
         section.enabled_plugins_for_privileged if membership.is_privileged else section.enabled_plugins
     )
 
-    items.extend(
-        [
-            nav_item
-            for plugin in plugins  # type: Plugin
-            if (apps := plugin.app_config) and (nav_item := apps.as_navigation_item(request))  # type: PluginAppConfig
-        ]
-    )
-
-    return items
+    for plugin in plugins:
+        apps: PluginAppConfig = plugin.app_config
+        item = apps.as_navigation_item(request=request, bound_plugin=plugin)
+        if item:
+            yield item
 
 
 @register.simple_tag(takes_context=True)