Merge branch '9-poster-group-not-showing-up-in-menu' into 'master'

Resolve "Poster group not showing up in menu"

Closes #9

See merge request AlekSIS/official/AlekSIS-App-Resint!37

CHANGELOG.rst

@@ -18,6 +18,7 @@ Fixed
 ~~~~~
 
 * Live documents table showed two "Actions" columns.
+* Menu was not correctly re-generated after creating or editing poster groups
 * Button for creation of live documents was there even if there weren't any live document types registered.
 
 `2.0`_ - 2021-12-27

aleksis/apps/resint/menus.py

@@ -2,7 +2,6 @@ from typing import Any, Dict, List
 
 from django.apps import apps
 from django.urls import reverse
-from django.utils.functional import lazy
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -30,57 +29,59 @@ def _get_menu_entries() -> List[Dict[str, Any]]:
     ]
 
 
-get_menu_entries_lazy = lazy(_get_menu_entries, list)
-
-MENUS = {
-    "NAV_MENU_CORE": [
-        {
-            "name": _("Documents"),
-            "url": "#",
-            "icon": "open_in_browser",
-            "root": True,
-            "validators": [
-                (
-                    "aleksis.core.util.predicates.permission_validator",
-                    "resint.view_poster_menu",
-                ),
-            ],
-            "submenu": [
-                {
-                    "name": _("Manage posters"),
-                    "url": "poster_index",
-                    "icon": "file_upload",
-                    "validators": [
-                        (
-                            "aleksis.core.util.predicates.permission_validator",
-                            "resint.view_posters_rule",
-                        ),
-                    ],
-                },
+class MENUS:
+    def get(menu_name, default=None):
+        menus = {
+            "NAV_MENU_CORE": [
                 {
-                    "name": _("Poster groups"),
-                    "url": "poster_group_list",
-                    "icon": "topic",
+                    "name": _("Documents"),
+                    "url": "#",
+                    "icon": "open_in_browser",
+                    "root": True,
                     "validators": [
                         (
                             "aleksis.core.util.predicates.permission_validator",
-                            "resint.view_postergroups_rule",
+                            "resint.view_poster_menu",
                         ),
                     ],
-                },
-                {
-                    "name": _("Live documents"),
-                    "url": "live_documents",
-                    "icon": "update",
-                    "validators": [
-                        (
-                            "aleksis.core.util.predicates.permission_validator",
-                            "resint.view_livedocuments_rule",
-                        ),
+                    "submenu": [
+                        {
+                            "name": _("Manage posters"),
+                            "url": "poster_index",
+                            "icon": "file_upload",
+                            "validators": [
+                                (
+                                    "aleksis.core.util.predicates.permission_validator",
+                                    "resint.view_posters_rule",
+                                ),
+                            ],
+                        },
+                        {
+                            "name": _("Poster groups"),
+                            "url": "poster_group_list",
+                            "icon": "topic",
+                            "validators": [
+                                (
+                                    "aleksis.core.util.predicates.permission_validator",
+                                    "resint.view_postergroups_rule",
+                                ),
+                            ],
+                        },
+                        {
+                            "name": _("Live documents"),
+                            "url": "live_documents",
+                            "icon": "update",
+                            "validators": [
+                                (
+                                    "aleksis.core.util.predicates.permission_validator",
+                                    "resint.view_livedocuments_rule",
+                                ),
+                            ],
+                        },
                     ],
-                },
-            ],
+                }
+            ]
+            + _get_menu_entries(),
         }
-    ]
-    + get_menu_entries_lazy(),
-}
+
+        return menus.get(menu_name, default)