diff --git a/gregsite/middleware/revision_user_middleware.py b/gregsite/middleware/revision_user_middleware.py index 92cd72a033468e4832be7430112f1a3f513f2343..ddb449bdd12e7560a32912c2e7b1ad6baadc821a 100644 --- a/gregsite/middleware/revision_user_middleware.py +++ b/gregsite/middleware/revision_user_middleware.py @@ -1,7 +1,12 @@ from functools import wraps # from reversion.views import _request_creates_revision, create_revision -from reversion.revisions import create_revision as create_revision_base, set_user, get_user, set_comment +from reversion.revisions import ( + create_revision as create_revision_base, + set_user, + get_user, + set_comment, +) class RevisionUserMiddleware: @@ -19,7 +24,7 @@ class RevisionUserMiddleware: manage_manually=self.manage_manually, using=self.using, atomic=self.atomic, - request_creates_revision=self.request_creates_revision + request_creates_revision=self.request_creates_revision, )(get_response) def request_creates_revision(self, request): @@ -34,7 +39,11 @@ def _request_creates_revision(request): def _set_user_from_request(request): - if getattr(request, "user", None) and request.user.is_authenticated and get_user() is None: + if ( + getattr(request, "user", None) + and request.user.is_authenticated + and get_user() is None + ): set_user(request.user) @@ -43,7 +52,9 @@ def _set_comment_to_external_user_from_request(request): set_comment("User: " + request.headers["External-User"]) -def create_revision(manage_manually=False, using=None, atomic=True, request_creates_revision=None): +def create_revision( + manage_manually=False, using=None, atomic=True, request_creates_revision=None +): """ View decorator that wraps the request in a revision. @@ -55,13 +66,16 @@ def create_revision(manage_manually=False, using=None, atomic=True, request_crea @wraps(func) def do_revision_view(request, *args, **kwargs): if request_creates_revision(request): - with create_revision_base(manage_manually=manage_manually, using=using, atomic=atomic): + with create_revision_base( + manage_manually=manage_manually, using=using, atomic=atomic + ): response = func(request, *args, **kwargs) # Otherwise, we're good. _set_user_from_request(request) _set_comment_to_external_user_from_request(request) return response return func(request, *args, **kwargs) + return do_revision_view - return decorator + return decorator