Skip to content
Snippets Groups Projects
Commit d87e4450 authored by Tore.Brede's avatar Tore.Brede
Browse files

Running black on file

parent d222a190
No related branches found
No related tags found
1 merge request!9GREG-9 Audit log
Pipeline #87255 failed
from functools import wraps from functools import wraps
# from reversion.views import _request_creates_revision, create_revision # 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: class RevisionUserMiddleware:
...@@ -19,7 +24,7 @@ class RevisionUserMiddleware: ...@@ -19,7 +24,7 @@ class RevisionUserMiddleware:
manage_manually=self.manage_manually, manage_manually=self.manage_manually,
using=self.using, using=self.using,
atomic=self.atomic, atomic=self.atomic,
request_creates_revision=self.request_creates_revision request_creates_revision=self.request_creates_revision,
)(get_response) )(get_response)
def request_creates_revision(self, request): def request_creates_revision(self, request):
...@@ -34,7 +39,11 @@ def _request_creates_revision(request): ...@@ -34,7 +39,11 @@ def _request_creates_revision(request):
def _set_user_from_request(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) set_user(request.user)
...@@ -43,7 +52,9 @@ def _set_comment_to_external_user_from_request(request): ...@@ -43,7 +52,9 @@ def _set_comment_to_external_user_from_request(request):
set_comment("User: " + request.headers["External-User"]) 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. 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 ...@@ -55,13 +66,16 @@ def create_revision(manage_manually=False, using=None, atomic=True, request_crea
@wraps(func) @wraps(func)
def do_revision_view(request, *args, **kwargs): def do_revision_view(request, *args, **kwargs):
if request_creates_revision(request): 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) response = func(request, *args, **kwargs)
# Otherwise, we're good. # Otherwise, we're good.
_set_user_from_request(request) _set_user_from_request(request)
_set_comment_to_external_user_from_request(request) _set_comment_to_external_user_from_request(request)
return response return response
return func(request, *args, **kwargs) return func(request, *args, **kwargs)
return do_revision_view return do_revision_view
return decorator
return decorator
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment