Use existing class for global permissions

aleksis/apps/hjelp/models.py

@@ -9,10 +9,11 @@ from aleksis.core.util.model_helpers import COLOURS, ICONS
 from ckeditor.fields import RichTextField
 
 
-class Support(ExtensibleModel):
+class HjelpGlobalPermissions(ExtensibleModel):
     class Meta:
         managed = False
         permissions = (
+            ("ask_faq", _("Can ask FAQ question")),
             ("report_issue", _("Can report issues")),
             ("send_feedback", _("Can send feedback"))
         )
@@ -74,13 +75,3 @@ class IssueCategory(ExtensibleModel):
     class Meta:
         verbose_name = _("Bug report category")
         verbose_name_plural = _("Bug report categories")
-
-
-class GlobalPermissions(ExtensibleModel):
-    class Meta:
-        managed = False
-        permissions = (
-            ("ask_faq", _("Can ask FAQ question")),
-            ("report_issue", _("Can report issue")),
-            ("add_feedback", _("Can add feedback")),
-        )

aleksis/apps/hjelp/rules.py

@@ -14,5 +14,5 @@ report_issue_predicate = has_person & has_global_perm("hjelp.report_issue")
 add_perm("hjelp.report_issue", report_issue_predicate)
 
 # Add feedback
-add_feedback_predicate = has_person & has_global_perm("hjelp.add_feedback")
-add_perm("hjelp.add_feedback", add_feedback_predicate)
+send_feedback_predicate = has_person & has_global_perm("hjelp.send_feedback")
+add_perm("hjelp.send_feedback", send_feedback_predicate)

aleksis/apps/hjelp/views.py

@@ -131,7 +131,7 @@ def rebus(request):
     )
 
 
-@permission_required("hjelp.add_feedback")
+@permission_required("hjelp.send_feedback")
 def feedback(request):
     if request.method == "POST":
         form = FeedbackForm(request.POST)