Make sure to switch the context back to LogEntry and make sure to only include the performer if actually present

data/model/legacy.py

@@ -2053,7 +2053,8 @@ def list_logs(start_time, end_time, performer=None, repository=None, namespace=N
                     .join(Performer, JOIN_LEFT_OUTER,
                         on=(LogEntry.performer == Performer.id).alias('performer'))
                     .switch(LogEntry)
-                    .join(LogEntryKind))
+                    .join(LogEntryKind)
+                    .switch(LogEntry))
 
   if repository:
     joined = joined.where(LogEntry.repository == repository)

endpoints/api/logs.py

@@ -19,7 +19,7 @@ def log_view(log):
     'datetime': format_date(log.datetime),
   }
 
-  if log.performer:
+  if log.performer and log.performer.username:
     view['performer'] = {
       'kind': 'user',
       'name': log.performer.username,