Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
47d31005
Commit
47d31005
authored
Aug 24, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修复执行任务的bug
parent
2dbd6b6f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
adhoc.py
apps/ops/models/adhoc.py
+2
-0
No files found.
apps/ops/models/adhoc.py
View file @
47d31005
...
@@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
...
@@ -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):
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment