From a3baac67632ed20125c4c575ea12f1965c92ea8d Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 6 Feb 2023 11:27:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=BD=E4=BB=A4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/rbac/const.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/rbac/const.py b/apps/rbac/const.py index 192a0fe18..50d3a4c11 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -70,7 +70,6 @@ exclude_permissions = ( ('rbac', 'orgrolebinding', 'change', 'orgrolebinding'), ('rbac', 'menupermission', '*', 'menupermission'), ('rbac', 'role', '*', '*'), - ('ops', 'adhoc', 'delete,change', '*'), ('ops', 'adhocexecution', 'add,delete,change', '*'), ('ops', 'jobexecution', 'change,delete', 'jobexecution'), ('ops', 'historicaljob', '*', '*'), From 462dc2543bb89b12aa42d0566f7b8ed1274799e4 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 6 Feb 2023 16:19:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E4=BD=9C=E4=B8=9A=E6=8C=87=E5=AE=9A=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=B7=AF=E5=BE=84=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/ops/models/job.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index f19e63b9d..c8c16718b 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -176,9 +176,7 @@ class JobExecution(JMSOrgBaseModel): shell = self.current_job.args if self.current_job.chdir: - if module == self.current_job.module: - shell += " path={}".format(self.current_job.chdir) - else: + if module == "shell": shell += " chdir={}".format(self.current_job.chdir) if self.current_job.module in ['python']: shell += " executable={}".format(self.current_job.module)