From 2c8f51940af73fe614bbdd3614348d1210d88a16 Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Sat, 26 Nov 2022 03:13:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9ops=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/api/job.py    | 4 +++-
 apps/ops/models/job.py | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/ops/api/job.py b/apps/ops/api/job.py
index 86a52f373..e668bcee0 100644
--- a/apps/ops/api/job.py
+++ b/apps/ops/api/job.py
@@ -16,7 +16,9 @@ class JobViewSet(OrgBulkModelViewSet):
 
     def get_queryset(self):
         query_set = super().get_queryset()
-        return query_set.filter(instant=False)
+        if self.action != 'retrieve':
+            return query_set.filter(instant=False)
+        return query_set
 
     def perform_create(self, serializer):
         instance = serializer.save()
diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py
index f2e7eaa4b..3795a0455 100644
--- a/apps/ops/models/job.py
+++ b/apps/ops/models/job.py
@@ -91,6 +91,9 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
     def create_execution(self):
         return self.executions.create()
 
+    class Meta:
+        ordering = ['date_created']
+
 
 class JobExecution(JMSOrgBaseModel):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
@@ -198,3 +201,6 @@ class JobExecution(JMSOrgBaseModel):
         except Exception as e:
             logging.error(e, exc_info=True)
             self.set_error(e)
+
+    class Meta:
+        ordering = ['-date_created']