diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc index 9208d6a2..d382957f 100644 Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc differ diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py index 668e144b..001744dd 100644 --- a/osinaweb/osinacore/custom_context.py +++ b/osinaweb/osinacore/custom_context.py @@ -21,10 +21,14 @@ def calculate_time_ago(status): def utilities(request): - user_ids_online = Connection.objects.filter(status='Online').values('user_id').annotate(last_online=Max('date')).values_list('user_id', flat=True) + last_connections = Connection.objects.order_by('user', '-date').distinct('user') - # Now, filter StaffProfile objects associated with these user ids - online_staff_profiles = StaffProfile.objects.filter(user_id__in=user_ids_online) + online_staff_profiles = [] + + for connection in last_connections: + if connection.status == 'Online': + # Add user staff profile to online_staff_profiles + online_staff_profiles.append(connection.user.staffprofile) notes = None recent_note = None if request.user.is_authenticated: