diff --git a/apps/audits/views.py b/apps/audits/views.py index 9e11ddabc..6ac0b1b99 100644 --- a/apps/audits/views.py +++ b/apps/audits/views.py @@ -120,7 +120,7 @@ class OperateLogListView(PermissionsMixin, DatetimeSearchMixin, ListView): def get_context_data(self, **kwargs): context = { - 'user_list': current_org.get_org_members(), + 'user_list': [str(user) for user in current_org.get_org_members()], 'actions': self.actions_dict, 'search_action': self.action, 'resource_type_list': get_resource_type_list(), @@ -161,7 +161,7 @@ class PasswordChangeLogList(PermissionsMixin, DatetimeSearchMixin, ListView): def get_context_data(self, **kwargs): context = { - 'user_list': current_org.get_org_members(), + 'user_list': [str(user) for user in current_org.get_org_members()], 'date_from': self.date_from, 'date_to': self.date_to, 'user': self.user, @@ -246,7 +246,7 @@ class CommandExecutionListView(UserCommandExecutionListView): 'action': _('Command execution log'), 'date_from': self.date_from, 'date_to': self.date_to, - 'user_list': self.get_user_list(), + 'user_list': [(str(user.id), user) for user in self.get_user_list()], 'keyword': self.keyword, 'user_id': self.user_id, }) diff --git a/apps/ops/templates/ops/command_execution_list.html b/apps/ops/templates/ops/command_execution_list.html index 29cd16c21..a21a1b108 100644 --- a/apps/ops/templates/ops/command_execution_list.html +++ b/apps/ops/templates/ops/command_execution_list.html @@ -39,8 +39,8 @@