Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
d87e4450
Commit
d87e4450
authored
3 years ago
by
Tore.Brede
Browse files
Options
Downloads
Patches
Plain Diff
Running black on file
parent
d222a190
No related branches found
No related tags found
1 merge request
!9
GREG-9 Audit log
Pipeline
#87255
failed
3 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gregsite/middleware/revision_user_middleware.py
+20
-6
20 additions, 6 deletions
gregsite/middleware/revision_user_middleware.py
with
20 additions
and
6 deletions
gregsite/middleware/revision_user_middleware.py
+
20
−
6
View file @
d87e4450
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment