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

Enable deletion of orphaned approval nodes

Browse Source 
Update serializer to include workflow approval for activity stream
This commit is contained in:
beeankha
2019-07-25 15:03:26 -04:00
committed by Ryan Petrello
parent 64c94d478d
commit 3357c96774
7 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/main/migrations/0083_v360_workflow_approval.py
View File

@@ -1,4 +1,4 @@
# Generated by Django 2.2.2 on 2019-07-18 14:12
# Generated by Django 2.2.2 on 2019-07-25 19:16
import awx.main.fields
from django.db import migrations, models
@@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('main', '0082_v360_workflowapproval'),
('main', '0082_v360_webhook_http_method'),
]
operations = [
@@ -32,6 +32,16 @@ class Migration(migrations.Migration):
field=awx.main.fields.ImplicitRoleField(editable=False, null='True', on_delete=django.db.models.deletion.CASCADE, parent_role=['singleton:system_auditor', 'organization.approval_role', 'admin_role'], related_name='+', to='main.Role'),
preserve_default='True',
),
migrations.AlterField(
model_name='workflowjobnode',
name='unified_job_template',
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workflowjobnodes', to='main.UnifiedJobTemplate'),
),
migrations.AlterField(
model_name='workflowjobtemplatenode',
name='unified_job_template',
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workflowjobtemplatenodes', to='main.UnifiedJobTemplate'),
),
migrations.CreateModel(
name='WorkflowApproval',
fields=[
@@ -40,4 +50,14 @@ class Migration(migrations.Migration):
],
bases=('main.unifiedjob',),
),
migrations.AddField(
model_name='activitystream',
name='workflow_approval',
field=models.ManyToManyField(blank=True, to='main.WorkflowApproval'),
),
migrations.AddField(
model_name='activitystream',
name='workflow_approval_template',
field=models.ManyToManyField(blank=True, to='main.WorkflowApprovalTemplate'),
),
]