Merge branch '24-rename-rules-to-allow-differentiation-from-permissions' into 'master'

Resolve "Rename rules to allow differentiation from permissions"

Closes #24

See merge request !69

aleksis/apps/untis/menus.py

@@ -6,7 +6,7 @@ MENUS = {
             "name": _("Untis XML import"),
             "url": "untis_xml_import",
             "validators": [
-                ("aleksis.core.util.predicates.permission_validator", "untis.do_xml_import",),
+                ("aleksis.core.util.predicates.permission_validator", "untis.do_xml_import_rule",),
             ],
         },
         {
@@ -15,7 +15,7 @@ MENUS = {
             "validators": [
                 (
                     "aleksis.core.util.predicates.permission_validator",
-                    "untis.assign_subjects_to_groups",
+                    "untis.assign_subjects_to_groups_rule",
                 ),
             ],
         },

aleksis/apps/untis/rules.py

@@ -4,11 +4,11 @@ from aleksis.core.util.predicates import has_global_perm, has_person
 
 # Do XML import
 do_xml_import_predicate = has_person & has_global_perm("untis.do_xml_import")
-add_perm("untis.do_xml_import", do_xml_import_predicate)
+add_perm("untis.do_xml_import_rule", do_xml_import_predicate)
 
 
 # Do XML import
 assign_subjects_to_groups_predicate = has_person & has_global_perm(
     "untis.assign_subjects_to_groups"
 )
-add_perm("untis.assign_subjects_to_groups", assign_subjects_to_groups_predicate)
+add_perm("untis.assign_subjects_to_groups_rule", assign_subjects_to_groups_predicate)

aleksis/apps/untis/views.py

@@ -7,7 +7,7 @@ from .forms import UntisUploadForm
 from .util.xml.xml import untis_import_xml
 
 
-@permission_required("untis.do_xml_import")
+@permission_required("untis.do_xml_import_rule")
 def xml_import(request: HttpRequest) -> HttpResponse:
     context = {}