diff options
| author | David Smith <smithdc@gmail.com> | 2020-07-24 07:25:47 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-07-30 10:58:59 +0200 |
| commit | e74b3d724e5ddfef96d1d66bd1c58e7aae26fc85 (patch) | |
| tree | e478c6d04bbd8b8e1059d67e4e34e61a7666cc58 /django/contrib/admin/options.py | |
| parent | 1173db4a16bb2938ba62a6cd50372a76a7f9e05f (diff) | |
Bumped minimum isort version to 5.1.0.
Fixed inner imports per isort 5.
isort 5.0.0 to 5.1.0 was unstable.
Diffstat (limited to 'django/contrib/admin/options.py')
| -rw-r--r-- | django/contrib/admin/options.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index e628afbe76..2b02de84e4 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -808,7 +808,7 @@ class ModelAdmin(BaseModelAdmin): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, ADDITION + from django.contrib.admin.models import ADDITION, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -824,7 +824,7 @@ class ModelAdmin(BaseModelAdmin): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, CHANGE + from django.contrib.admin.models import CHANGE, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -841,7 +841,7 @@ class ModelAdmin(BaseModelAdmin): The default implementation creates an admin LogEntry object. """ - from django.contrib.admin.models import LogEntry, DELETION + from django.contrib.admin.models import DELETION, LogEntry return LogEntry.objects.log_action( user_id=request.user.pk, content_type_id=get_content_type_for_model(object).pk, @@ -1910,6 +1910,7 @@ class ModelAdmin(BaseModelAdmin): def history_view(self, request, object_id, extra_context=None): "The 'history' admin view for this model." from django.contrib.admin.models import LogEntry + # First check if the user can see this history. model = self.model obj = self.get_object(request, unquote(object_id)) |
