diff options
author | Alan Rominger <arominge@redhat.com> | 2016-07-14 22:49:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-14 22:49:28 +0200 |
commit | 3b972e871d79365a0d3dc16dbbe375ccbe3b5a56 (patch) | |
tree | a23dfe8befe7ef7649224dcd80d8558b1d3beb8c | |
parent | Fix NaN / invalid end date value in schedule edit forms (#3007) (diff) | |
parent | switch order in migration (diff) | |
download | awx-3b972e871d79365a0d3dc16dbbe375ccbe3b5a56.tar.xz awx-3b972e871d79365a0d3dc16dbbe375ccbe3b5a56.zip |
Merge pull request #3014 from AlanCoding/migration_touchup
Switch order in migration 0026
-rw-r--r-- | awx/main/migrations/0026_v300_credential_unique.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/awx/main/migrations/0026_v300_credential_unique.py b/awx/main/migrations/0026_v300_credential_unique.py index b354ce3d62..3c1d714327 100644 --- a/awx/main/migrations/0026_v300_credential_unique.py +++ b/awx/main/migrations/0026_v300_credential_unique.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='credential', name='read_role', - field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_auditor', b'use_role', b'admin_role', b'organization.auditor_role'], to='main.Role', null=b'True'), + 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'), ), migrations.RunPython(migration_utils.set_current_apps_for_migrations), migrations.RunPython(rbac.rebuild_role_hierarchy), |