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

Merge pull request #5280 from jumpserver/pr@dev@fix_auto_push 

fix: 推送系统用户时 AdHocExecution id 重复
pull/5283/head
老广 2020-12-16 17:36:45 +08:00 committed by GitHub
parent b3642f3ff4 bf308e24b6
commit 4f04a7d258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ops/models/adhoc.py
View File

@ -180,8 +180,10 @@ class AdHoc(OrgModelMixin):
def run(self): def run(self):
try: try:
hid = current_task.request.id hid = current_task.request.id
if AdHocExecution.objects.filter(id=hid).exists():
hid = uuid.uuid4()
except AttributeError: except AttributeError:
hid = str(uuid.uuid4()) hid = uuid.uuid4()
execution = AdHocExecution( execution = AdHocExecution(
id=hid, adhoc=self, task=self.task, id=hid, adhoc=self, task=self.task,
task_display=str(self.task)[:128], task_display=str(self.task)[:128],

2
apps/ops/utils.py
View File

@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
from common.utils import get_logger, get_object_or_none from common.utils import get_logger, get_object_or_none
from common.tasks import send_mail_async from common.tasks import send_mail_async
from orgs.utils import tmp_to_org, org_aware_func from orgs.utils import org_aware_func
from .models import Task, AdHoc from .models import Task, AdHoc