From c6ecdbbfc148a374521f7e675d27ec85686f0d9c Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 1 Aug 2016 16:23:47 -0400 Subject: [PATCH] remove unrelated field from ask_skip_tags_on_launch migration and update migration and access.py changes to not conflict with other changes --- ...add_ask_skip_tags.py => 0029_v302_add_ask_skip_tags.py} | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) rename awx/main/migrations/{0027_v302_add_ask_skip_tags.py => 0029_v302_add_ask_skip_tags.py} (52%) diff --git a/awx/main/migrations/0027_v302_add_ask_skip_tags.py b/awx/main/migrations/0029_v302_add_ask_skip_tags.py similarity index 52% rename from awx/main/migrations/0027_v302_add_ask_skip_tags.py rename to awx/main/migrations/0029_v302_add_ask_skip_tags.py index 7d237ca9ff..0aa5192c33 100644 --- a/awx/main/migrations/0027_v302_add_ask_skip_tags.py +++ b/awx/main/migrations/0029_v302_add_ask_skip_tags.py @@ -8,7 +8,7 @@ import awx.main.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0026_v300_credential_unique'), + ('main', '0028_v300_org_team_cascade'), ] operations = [ @@ -17,9 +17,4 @@ class Migration(migrations.Migration): name='ask_skip_tags_on_launch', field=models.BooleanField(default=False), ), - migrations.AlterField( - model_name='credential', - name='read_role', - field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_auditor', b'organization.auditor_role', b'use_role', b'admin_role'], to='main.Role', null=b'True'), - ), ]