diff --git a/aleksis/core/rules.py b/aleksis/core/rules.py index 170829b6d62e60e96780de181756674d1187ce54..022fa11a00671a3acb0775c2229a378bd3981342 100644 --- a/aleksis/core/rules.py +++ b/aleksis/core/rules.py @@ -329,11 +329,7 @@ rules.add_perm("core.can_change_password", can_change_password_predicate) invite_enabled_predicate = is_site_preference_set(section="auth", pref="invite_enabled") rules.add_perm("core.invite_enabled", invite_enabled_predicate) -can_invite_predicate = ( - invite_enabled_predicate - & has_person - & has_global_perm("core.invite") -) +can_invite_predicate = invite_enabled_predicate & has_person & has_global_perm("core.invite") rules.add_perm("core.can_invite", can_invite_predicate) # OAuth2 permissions diff --git a/aleksis/core/views.py b/aleksis/core/views.py index 870ece0870a0d134a1a6c2b860cfc10cc92eadd7..fc32d75982a26e9fafbcd0f4a98e2b0569e585c4 100644 --- a/aleksis/core/views.py +++ b/aleksis/core/views.py @@ -1418,7 +1418,11 @@ class AccountRegisterView(SignupView): success_url = reverse_lazy("index") def dispatch(self, request, *args, **kwargs): - if not request.user.has_perm("core.can_register") and not request.session.get("account_verified_email") and not request.session.get("invitation_code_entered"): + if ( + not request.user.has_perm("core.can_register") + and not request.session.get("account_verified_email") + and not request.session.get("invitation_code_entered") + ): raise PermissionDenied() return super(AccountRegisterView, self).dispatch(request, *args, **kwargs) @@ -1462,7 +1466,7 @@ class InvitePersonByID(PermissionRequiredMixin, SingleObjectMixin, View): class InviteDisabledView(PermissionRequiredMixin, TemplateView): - """View to display a notice that the invite feature is disabled and how to enable it. """ + """View to display a notice that the invite feature is disabled and how to enable it.""" template_name = "invitations/disabled.html" permission_required = "core.change_site_preferences_rule"