diff --git a/src/backend/InvenTree/InvenTree/views.py b/src/backend/InvenTree/InvenTree/views.py index 557db269c1..d43383af54 100644 --- a/src/backend/InvenTree/InvenTree/views.py +++ b/src/backend/InvenTree/InvenTree/views.py @@ -479,9 +479,9 @@ class SettingsView(TemplateView): # user db sessions ctx['session_key'] = self.request.session.session_key - ctx['session_list'] = self.request.user.session_set.filter( - expire_date__gt=now() - ).order_by('-last_activity') + ctx['session_list'] = self.request.user.usersession_set.order_by( + '-last_seen_at' + ) return ctx diff --git a/src/backend/InvenTree/templates/InvenTree/settings/user.html b/src/backend/InvenTree/templates/InvenTree/settings/user.html index eb3a451c4c..d621b3d5b3 100644 --- a/src/backend/InvenTree/templates/InvenTree/settings/user.html +++ b/src/backend/InvenTree/templates/InvenTree/settings/user.html @@ -200,9 +200,9 @@ {% endif %} {% if object.session_key == session_key %} - {% blocktrans with time=object.last_activity|timesince %}{{ time }} ago (this session){% endblocktrans %} + {% blocktrans with time=object.last_seen_at|timesince %}{{ time }} ago (this session){% endblocktrans %} {% else %} - {% blocktrans with time=object.last_activity|timesince %}{{ time }} ago{% endblocktrans %} + {% blocktrans with time=object.last_seen_at|timesince %}{{ time }} ago{% endblocktrans %} {% endif %}