github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: 修改ops api

pull/9123/head
Aaron3S 2022-11-26 03:13:06 +08:00
parent 5e503ec5b8
commit 2c8f51940a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ops/api/job.py
View File

@ -16,7 +16,9 @@ class JobViewSet(OrgBulkModelViewSet):
def get_queryset(self): def get_queryset(self):
query_set = super().get_queryset() query_set = super().get_queryset()
if self.action != 'retrieve':
return query_set.filter(instant=False) return query_set.filter(instant=False)
return query_set
def perform_create(self, serializer): def perform_create(self, serializer):
instance = serializer.save() instance = serializer.save()

6
apps/ops/models/job.py
View File

@ -91,6 +91,9 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
def create_execution(self): def create_execution(self):
return self.executions.create() return self.executions.create()
class Meta:
ordering = ['date_created']
class JobExecution(JMSOrgBaseModel): class JobExecution(JMSOrgBaseModel):
id = models.UUIDField(default=uuid.uuid4, primary_key=True) id = models.UUIDField(default=uuid.uuid4, primary_key=True)
@ -198,3 +201,6 @@ class JobExecution(JMSOrgBaseModel):
except Exception as e: except Exception as e:
logging.error(e, exc_info=True) logging.error(e, exc_info=True)
self.set_error(e) self.set_error(e)
class Meta:
ordering = ['-date_created']