From d969563e43d43167c337698ddd4b16e76e1c9841 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 14 Apr 2020 10:42:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=B9=B3=E5=8F=B0=E5=88=97=E8=A1=A8=E5=9C=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/templates/assets/platform_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/templates/assets/platform_detail.html b/apps/assets/templates/assets/platform_detail.html index e05de4232..89d364e0f 100644 --- a/apps/assets/templates/assets/platform_detail.html +++ b/apps/assets/templates/assets/platform_detail.html @@ -83,7 +83,7 @@ $(document).ready(function () { var $this = $(this); var name = "{{ object.name}}"; var uid = "{{ object.id }}"; - var the_url = '{% url "api-assets:asset-platform-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); + var the_url = '{% url "api-assets:platform-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'assets:platform-list' %}"; objectDelete($this, name, the_url, redirect_url); }) From 48fa26a3bce48440df898cd71eb8be40eb86d84b Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 14 Apr 2020 11:03:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B2=A1=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/templates/audits/operate_log_list.html | 2 +- apps/audits/views.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/audits/templates/audits/operate_log_list.html b/apps/audits/templates/audits/operate_log_list.html index fdc03ce35..0dd8c8ff4 100644 --- a/apps/audits/templates/audits/operate_log_list.html +++ b/apps/audits/templates/audits/operate_log_list.html @@ -44,7 +44,7 @@ diff --git a/apps/audits/views.py b/apps/audits/views.py index 7bc6f6880..9e11ddabc 100644 --- a/apps/audits/views.py +++ b/apps/audits/views.py @@ -122,6 +122,7 @@ class OperateLogListView(PermissionsMixin, DatetimeSearchMixin, ListView): context = { 'user_list': current_org.get_org_members(), 'actions': self.actions_dict, + 'search_action': self.action, 'resource_type_list': get_resource_type_list(), 'date_from': self.date_from, 'date_to': self.date_to, From 63519ec076a5ab478def9cb052857576e170bf75 Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 14 Apr 2020 12:51:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=AE=B0=E5=BD=95/=E6=93=8D=E4=BD=9C/=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E6=97=A5=E5=BF=97=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B2=A1=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/views.py | 6 +++--- apps/ops/templates/ops/command_execution_list.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 @@