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

update imports and further consolidate

Browse Source
This commit is contained in:
Wayne Witzel III
2016-12-12 19:22:09 -05:00
parent 83b985ed2e
commit c9dab5805d
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0034_v310_release.py
View File

@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
options={ options={
'ordering': ('id',), 'ordering': ('id',),
}, },
bases=('main.unifiedjob', models.Model, awx.main.models.notifications.JobNotificationMixin, awx.main.models.workflow.WorkflowJobInheritNodesMixin), bases=('main.unifiedjob', models.Model, awx.main.models.notifications.JobNotificationMixin),
), ),
migrations.CreateModel( migrations.CreateModel(
name='WorkflowJobNode', name='WorkflowJobNode',

7
awx/main/migrations/0035_v310_remove_tower_settings.py
View File

@@ -1,12 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations
import awx.main.models.notifications
import jsonfield.fields
import django.db.models.deletion
import awx.main.models.workflow
import awx.main.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):

5
awx/main/models/workflow.py
View File

@@ -435,11 +435,6 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
return new_wfjt return new_wfjt
# Stub in place because of old migrations, can remove if migrations are squashed
class WorkflowJobInheritNodesMixin(object):
pass
class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificationMixin): class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificationMixin):
class Meta: class Meta:
app_label = 'main' app_label = 'main'