Sheets: fix reload after rollback - fix display of the last history version

1 files changed, 9 insertions, 6 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index c2fab5bde..fbac512cd 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -203,13 +203,16 @@ def show_item(model, name, extra_dct=None, model_for_perms=None):
                 try:
                     date = datetime.datetime.strptime(date,
                                                       '%Y-%m-%dT%H:%M:%S.%f')
-                    item = item.get_previous(date=date)
-                    assert item is not None
+                    if item.get_last_history_date() != date:
+                        item = item.get_previous(date=date)
+                        assert item is not None
+                        dct['previous'] = item._previous
+                        dct['next'] = item._next
+                    else:
+                        date = None
                 except (ValueError, AssertionError):
-                    return HttpResponse(None, content_type='text/plain')
-                dct['previous'] = item._previous
-                dct['next'] = item._next
-            else:
+                    return HttpResponse('', content_type='text/plain')
+            if not date:
                 historized = item.history.all()
                 if historized:
                     item.history_date = historized[0].history_date