github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复自动化修改密码bug

Browse Source
This commit is contained in:
feng
2022-10-21 18:19:09 +08:00
parent 091bffa626
commit 64daacce63
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/assets/models/automations/base.py
View File

@@ -40,15 +40,18 @@ class BaseAutomation(CommonModelMixin, PeriodTaskModelMixin, OrgModelMixin):
def get_register_task(self):
raise NotImplementedError
def get_many_to_many_ids(self, field: str):
return [str(i) for i in getattr(self, field).all().values_list('id', flat=True)]
def to_attr_json(self):
return {
'name': self.name,
'type': self.type,
'org_id': self.org_id,
'org_id': str(self.org_id),
'comment': self.comment,
'accounts': self.accounts,
'nodes': list(self.nodes.all().values_list('id', flat=True)),
'assets': list(self.assets.all().values_list('id', flat=True)),
'nodes': self.get_many_to_many_ids('nodes'),
'assets': self.get_many_to_many_ids('assets'),
}
def execute(self, trigger=Trigger.manual):
@@ -59,7 +62,7 @@ class BaseAutomation(CommonModelMixin, PeriodTaskModelMixin, OrgModelMixin):
execution = self.executions.model.objects.create(
id=eid, trigger=trigger, automation=self,
plan_snapshot=self.to_attr_json(),
snapshot=self.to_attr_json(),
)
return execution.start()