From f8c69aadcbdc65f5305285ac0e7e0b1d4af6ffc7 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Wed, 12 Jun 2019 10:13:45 -0400 Subject: [PATCH] Correctly manage current apps for the action_node addition --- .../0061_v350_track_native_credentialtype_source.py | 2 ++ awx/main/migrations/0067_v350_credential_plugins.py | 2 ++ awx/main/migrations/0080_v360_replace_job_origin.py | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/awx/main/migrations/0061_v350_track_native_credentialtype_source.py b/awx/main/migrations/0061_v350_track_native_credentialtype_source.py index 5df5a32bc6..4a06b3bd53 100644 --- a/awx/main/migrations/0061_v350_track_native_credentialtype_source.py +++ b/awx/main/migrations/0061_v350_track_native_credentialtype_source.py @@ -5,9 +5,11 @@ from __future__ import unicode_literals from django.db import migrations, models from awx.main.models import CredentialType +from awx.main.utils.common import set_current_apps def migrate_to_static_inputs(apps, schema_editor): + set_current_apps(apps) CredentialType.setup_tower_managed_defaults() diff --git a/awx/main/migrations/0067_v350_credential_plugins.py b/awx/main/migrations/0067_v350_credential_plugins.py index 8d3a1f824f..e80e9f543b 100644 --- a/awx/main/migrations/0067_v350_credential_plugins.py +++ b/awx/main/migrations/0067_v350_credential_plugins.py @@ -9,9 +9,11 @@ import taggit.managers # AWX import awx.main.fields from awx.main.models import CredentialType +from awx.main.utils.common import set_current_apps def setup_tower_managed_defaults(apps, schema_editor): + set_current_apps(apps) CredentialType.setup_tower_managed_defaults() diff --git a/awx/main/migrations/0080_v360_replace_job_origin.py b/awx/main/migrations/0080_v360_replace_job_origin.py index 05e76316f6..4289dd5abd 100644 --- a/awx/main/migrations/0080_v360_replace_job_origin.py +++ b/awx/main/migrations/0080_v360_replace_job_origin.py @@ -4,6 +4,8 @@ from __future__ import unicode_literals from django.db import migrations, models +from awx.main.utils.common import set_current_apps + class Migration(migrations.Migration): @@ -12,6 +14,7 @@ class Migration(migrations.Migration): ] operations = [ + migrations.RunPython(migrations.RunPython.noop, lambda apps, schema_editor: set_current_apps(apps)), migrations.RemoveField( model_name='joborigin', name='instance', @@ -28,4 +31,5 @@ class Migration(migrations.Migration): migrations.DeleteModel( name='JobOrigin', ), + migrations.RunPython(lambda apps, schema_editor: set_current_apps(apps), migrations.RunPython.noop) ]