External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-1040 Inserted migration 34 from master, defined additional model changes needed, regenerated previous migrations 34/35/36/37 as 35/36/37/38.

Browse Source
This commit is contained in:
Chris Church
2014-03-24 16:09:49 -04:00
parent e6f3032b94
commit 1a7dc83479
13 changed files with 2394 additions and 1794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/models/jobs.py
View File

@@ -247,7 +247,6 @@ class JobBase(JobOptions):
hosts = models.ManyToManyField(
'Host',
related_name='%(class)ss',
blank=True,
editable=False,
through='JobHostSummary',
)
@@ -572,6 +571,8 @@ if getattr(settings, 'UNIFIED_JOBS_STEP') == 0:
'Job',
related_name='job_host_summaries',
on_delete=models.CASCADE,
null=True,
default=None,
editable=False,
)
new_job = models.ForeignKey(
@@ -710,7 +711,6 @@ class JobEventBase(CreatedModifiedModel):
host = models.ForeignKey(
'Host',
related_name='job_events_as_primary_host',
blank=True,
null=True,
default=None,
on_delete=models.SET_NULL,
@@ -719,31 +719,26 @@ class JobEventBase(CreatedModifiedModel):
hosts = models.ManyToManyField(
'Host',
related_name='job_events',
blank=True,
editable=False,
)
play = models.CharField(
max_length=1024,
blank=True,
default='',
editable=False,
)
role = models.CharField( # FIXME: Determine from callback or task name.
max_length=1024,
blank=True,
default='',
editable=False,
)
task = models.CharField(
max_length=1024,
blank=True,
default='',
editable=False,
)
parent = models.ForeignKey(
'self',
related_name='children',
blank=True,
null=True,
default=None,
on_delete=models.SET_NULL,
@@ -984,6 +979,8 @@ if getattr(settings, 'UNIFIED_JOBS_STEP') == 0:
'Job',
related_name='job_events',
on_delete=models.CASCADE,
null=True,
default=None,
editable=False,
)
new_job = models.ForeignKey(