Merge branch '54-check-menu-point-permissions' into 'master'

Resolve "Check menu point permissions"

Closes #54

See merge request !166

CHANGELOG.rst

@@ -14,6 +14,11 @@ Added
 
 * Menu icon changes when entry is selected.
 
+Fixed
+~~~~~
+
+* Menu item was shown although the user had no permission to use support functions.
+
 `3.0`_ - 2023-05-14
 -------------------
 

aleksis/apps/hjelp/frontend/index.js

@@ -4,6 +4,7 @@ export default {
     titleKey: "hjelp.menu_title",
     icon: "mdi-help-circle-outline",
     iconActive: "mdi-help-circle",
+    permission: "hjelp.show_menu_rule",
   },
   props: {
     byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,

aleksis/apps/hjelp/rules.py

@@ -2,18 +2,6 @@ from rules import add_perm
 
 from aleksis.core.util.predicates import has_global_perm, has_person, is_site_preference_set
 
-# Show Hjelp menu
-show_hjelp_menu = is_site_preference_set("hjelp", "public_faq") | (
-    has_person
-    & (
-        has_global_perm("hjelp.view_faq")
-        | has_global_perm("hjelp.ask_faq")
-        | has_global_perm("hjelp.report_issue")
-        | has_global_perm("hjelp.send_feedback")
-    )
-)
-add_perm("hjelp.show_menu_rule", show_hjelp_menu)
-
 # View FAQ
 view_faq_predicate = is_site_preference_set("hjelp", "public_faq") | (
     has_person & has_global_perm("hjelp.view_faq")
@@ -37,3 +25,16 @@ add_perm("hjelp.report_issue_rule", report_issue_predicate)
 # Add feedback
 send_feedback_predicate = has_person & has_global_perm("hjelp.send_feedback")
 add_perm("hjelp.send_feedback_rule", send_feedback_predicate)
+
+# Show Hjelp menu
+show_hjelp_menu = is_site_preference_set("hjelp", "public_faq") | (
+    has_person
+    & (
+        view_faq_predicate
+        | change_faq_predicate
+        | ask_faq_predicate
+        | report_issue_predicate
+        | send_feedback_predicate
+    )
+)
+add_perm("hjelp.show_menu_rule", show_hjelp_menu)