diff --git a/awx/main/migrations/0029_v330_members_can_see_teams.py b/awx/main/migrations/0029_v330_members_can_see_teams.py deleted file mode 100644 index a314bda418..0000000000 --- a/awx/main/migrations/0029_v330_members_can_see_teams.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-04-02 19:18 -from __future__ import unicode_literals - -from django.db import migrations -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - -import awx.main.fields - -from awx.main.migrations import ActivityStreamDisabledMigration -from awx.main.migrations import _rbac as rbac -from awx.main.migrations import _migration_utils as migration_utils - - -class Migration(ActivityStreamDisabledMigration): - - dependencies = [ - ('main', '0028_v330_add_tower_verify'), - ] - - operations = [ - migrations.AlterField( - model_name='team', - name='read_role', - field=awx.main.fields.ImplicitRoleField(null=b'True', on_delete=django.db.models.deletion.CASCADE, parent_role=[b'organization.auditor_role', b'organization.member_role', b'member_role'], related_name='+', to='main.Role'), - ), - migrations.RunPython(migration_utils.set_current_apps_for_migrations), - migrations.RunPython(rbac.rebuild_role_hierarchy), - ] diff --git a/awx/main/migrations/0030_v330_modify_application.py b/awx/main/migrations/0030_v330_modify_application.py index 54d190292b..7725ffeaff 100644 --- a/awx/main/migrations/0030_v330_modify_application.py +++ b/awx/main/migrations/0030_v330_modify_application.py @@ -11,7 +11,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('main', '0029_v330_members_can_see_teams'), + ('main', '0028_v330_add_tower_verify'), ] operations = [ diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py index 8bf0701821..db406fd2ed 100644 --- a/awx/main/models/organization.py +++ b/awx/main/models/organization.py @@ -112,7 +112,7 @@ class Team(CommonModelNameNotUnique, ResourceMixin): parent_role='admin_role', ) read_role = ImplicitRoleField( - parent_role=['organization.auditor_role', 'organization.member_role', 'member_role'], + parent_role=['organization.auditor_role', 'member_role'], ) def get_absolute_url(self, request=None):