Skip to content

Do not overwrite creating fields if were set explicitly #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
st4lk wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Do not overwrite creating fields if were set explicitly #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dd7fe6
Do not overwrite creating fields if were set explicitly
st4lk Feb 28, 2019
b8ebbf7
Do not overwrite LastUserField, LastSessionKeyField if were set expli…
May 2, 2019
f8c0cca
Always update last user if he is available (#2)
st4lk May 3, 2019
44eb04a
Revert Last* field changes
st4lk May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audit_log/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (0, 8, 0, 'final')
VERSION = (0, 9, 1, 'alpha')

if VERSION[-1] != "final": # pragma: no cover
__version__ = '.'.join(map(str, VERSION))
Expand Down
18 changes: 10 additions & 8 deletions audit_log/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,21 @@ def _update_post_save_info(self, user, session, sender, instance, created, **kwa
registry = registration.FieldRegistry(fields.CreatingUserField)
if sender in registry:
for field in registry.get_fields(sender):
setattr(instance, field.name, user)
_disable_audit_log_managers(instance)
instance.save()
_enable_audit_log_managers(instance)
if not getattr(instance, field.name, None):
setattr(instance, field.name, user)
_disable_audit_log_managers(instance)
instance.save()
_enable_audit_log_managers(instance)


registry = registration.FieldRegistry(fields.CreatingSessionKeyField)
if sender in registry:
for field in registry.get_fields(sender):
setattr(instance, field.name, session)
_disable_audit_log_managers(instance)
instance.save()
_enable_audit_log_managers(instance)
if not getattr(instance, field.name, None):
setattr(instance, field.name, session)
_disable_audit_log_managers(instance)
instance.save()
_enable_audit_log_managers(instance)



Expand Down