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

Merge pull request #1736 from jumpserver/bugfix_run_adhoc 

[Update] 修复执行任务的bug
pull/1737/head
老广 2018-08-24 12:11:27 +08:00 committed by GitHub
parent 483a7617ce 6b047ca702
commit dc918c031c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
from django_celery_beat.models import PeriodicTask from django_celery_beat.models import PeriodicTask
from common.utils import get_signer, get_logger from common.utils import get_signer, get_logger
from orgs.utils import set_to_root_org
from ..celery.utils import delete_celery_periodic_task, \ from ..celery.utils import delete_celery_periodic_task, \
create_or_update_celery_periodic_tasks, \ create_or_update_celery_periodic_tasks, \
disable_celery_periodic_task disable_celery_periodic_task
@ -83,6 +84,7 @@ class Task(models.Model):
return self.history.all() return self.history.all()
def run(self, record=True): def run(self, record=True):
set_to_root_org()
if self.latest_adhoc: if self.latest_adhoc:
return self.latest_adhoc.run(record=record) return self.latest_adhoc.run(record=record)
else: else: