Skip to content

Commit fb74441

Browse files
authored
Merge branch 'master' into haikuginger/lazy_model_translation
2 parents dc3b446 + 15271ca commit fb74441

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Authors
3232
- Rod Xavier Bondoc
3333
- Ross Lote
3434
- Steven Klass
35+
- Steeve Chailloux
3536
- Trey Hunner
3637
- Ulysses Vilela
3738
- vnagendra

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Changes
33

44
Unreleased
55
----------
6+
- Use get_queryset rather than model.objects in history_view. (gh-303)
67
- Change ugettext calls in models.py to ugettext_lazy
78

89
1.9.0 (2017-06-11)

simple_history/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def history_view(self, request, object_id, extra_context=None):
6060
history_list_display = getattr(self, "history_list_display", [])
6161
# If no history was found, see whether this object even exists.
6262
try:
63-
obj = model.objects.get(**{pk_name: object_id})
63+
obj = self.get_queryset(request).get(**{pk_name: object_id})
6464
except model.DoesNotExist:
6565
try:
6666
obj = action_list.latest('history_date').instance

0 commit comments

Comments
 (0)