From 614aa069b0ba8bbd22733dd9ba2cded88f1b1c01 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 20 Feb 2023 16:05:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=20str=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95,=20=E4=BF=AE=E5=A4=8D=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=8D=E5=8F=8B=E5=A5=BD=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#9640)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Aaron3S --- apps/ops/models/job.py | 5 +++-- apps/ops/models/playbook.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index 2987d01f8..d17dcd442 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -46,6 +46,9 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin): version = models.IntegerField(default=0) history = HistoricalRecords() + def __str__(self): + return self.name + def get_history(self, version): return self.history.filter(version=version).first() @@ -360,5 +363,3 @@ class JobExecution(JMSOrgBaseModel): class Meta: verbose_name = _("Job Execution") ordering = ['-date_created'] - - diff --git a/apps/ops/models/playbook.py b/apps/ops/models/playbook.py index af0ec28db..82491480b 100644 --- a/apps/ops/models/playbook.py +++ b/apps/ops/models/playbook.py @@ -28,6 +28,9 @@ class Playbook(JMSOrgBaseModel): verbose_name=_('CreateMethod')) vcs_url = models.CharField(max_length=1024, default='', verbose_name=_('VCS URL'), null=True, blank=True) + def __str__(self): + return self.name + def check_dangerous_keywords(self): result = [] for root, dirs, files in os.walk(self.work_dir):