More vperms -> visit_perms

backend/mixins.py

@@ -70,12 +70,12 @@ class VisitorTemplateView(VisitorMixin, TemplateView):
 
 class VisitPersonMixin(VisitorMixin):
     """
-    Visit a person record. Adds self.person and self.vperms with the
+    Visit a person record. Adds self.person and self.visit_perms with the
     permissions the visitor has over the person
     """
     # Define to "edit_bio" "edit_ldap" or "view_person_audit_log" to raise
     # PermissionDenied if the given test on the person-visitor fails
-    require_vperms = None
+    require_visit_perms = None
 
     def get_person(self):
         key = self.kwargs.get("key", None)
@@ -94,7 +94,7 @@ class VisitPersonMixin(VisitorMixin):
 
     def check_permissions(self):
         super(VisitPersonMixin, self).check_permissions()
-        if self.require_vperms and self.require_vperms not in self.visit_perms.perms:
+        if self.require_visit_perms and self.require_visit_perms not in self.visit_perms.perms:
             raise PermissionDenied
 
     def get_context_data(self, **kw):
@@ -111,7 +111,7 @@ class VisitPersonTemplateView(VisitPersonMixin, TemplateView):
 
 class VisitProcessMixin(VisitPersonMixin):
     """
-    Visit a person process. Adds self.person, self.process and self.vperms with
+    Visit a person process. Adds self.person, self.process and self.visit_perms with
     the permissions the visitor has over the person
     """
     def get_person(self):

fprs/views.py

@@ -23,7 +23,7 @@ class NewFingerprintForm(forms.ModelForm):
 
 class PersonFingerprints(VisitPersonMixin, FormView):
     template_name = "fprs/list.html"
-    require_vperms = "edit_ldap"
+    require_visit_perms = "edit_ldap"
     form_class = NewFingerprintForm
 
     @transaction.atomic
@@ -52,7 +52,7 @@ class FingerprintMixin(VisitPersonMixin):
 
 
 class SetActiveFingerprint(FingerprintMixin, View):
-    require_vperms = "edit_ldap"
+    require_visit_perms = "edit_ldap"
 
     @transaction.atomic
     def post(self, request, *args, **kw):

process/views.py

@@ -39,7 +39,7 @@ class Create(VisitPersonMixin, FormView):
     """
     Create a new process
     """
-    require_vperms = "request_new_status"
+    require_visit_perms = "request_new_status"
     template_name = "process/create.html"
 
     def get_context_data(self, **kw):
@@ -246,7 +246,7 @@ class UnassignAM(RequirementMixin, View):
 
 
 class StatementMixin(RequirementMixin):
-    require_vperms = "see_statements"
+    require_visit_perms = "see_statements"
 
     def load_objects(self):
         super(StatementMixin, self).load_objects()
@@ -273,7 +273,7 @@ class StatementMixin(RequirementMixin):
 
 class StatementCreate(StatementMixin, FormView):
     form_class = StatementForm
-    require_vperms = "edit_statements"
+    require_visit_perms = "edit_statements"
     template_name = "process/statement_edit.html"
 
     def load_objects(self):
@@ -340,7 +340,7 @@ class StatementCreate(StatementMixin, FormView):
 
 
 class StatementDelete(StatementMixin, TemplateView):
-    require_vperms = "edit_statements"
+    require_visit_perms = "edit_statements"
     template_name = "process/statement_delete.html"
 
     def post(self, request, *args, **kw):
@@ -354,7 +354,7 @@ class StatementRaw(StatementMixin, View):
 
 
 class MailArchive(VisitProcessMixin, View):
-    require_vperms = "view_mbox"
+    require_visit_perms = "view_mbox"
 
     def get(self, request, key, *args, **kw):
         fname = self.process.mailbox_file
@@ -380,7 +380,7 @@ class MailArchive(VisitProcessMixin, View):
 
 
 class DisplayMailArchive(VisitProcessMixin, TemplateView):
-    require_vperms = "view_mbox"
+    require_visit_perms = "view_mbox"
     template_name = "restricted/display-mail-archive.html"
 
     def get_context_data(self, **kw):
@@ -510,10 +510,10 @@ class DisplayMailArchive(VisitProcessMixin, TemplateView):
 #
 #class Show(StatementMixin, VisitStatementMixin, TemplateView):
 #    template_name = "statements/show.html"
-#    require_vperms = "see_statements"
+#    require_visit_perms = "see_statements"
 #
 #
 #class Edit(EditStatementMixin, VisitStatementMixin, FormView):
 #    template_name = "statements/edit.html"
 #    form_class = StatementForm
-#    require_vperms = "edit_statements"
+#    require_visit_perms = "edit_statements"

public/views.py

@@ -419,7 +419,7 @@ class Process(VisitProcessTemplateView):
 
 
 class ProcessUpdateKeycheck(VisitProcessMixin, View):
-    require_vperms = "update_keycheck"
+    require_visit_perms = "update_keycheck"
 
     def post(self, request, key, *args, **kw):
         from keyring.models import Key