From e727909a6139c303ff6e0889d601b9f0ff49a632 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 26 Feb 2019 21:25:26 -0500 Subject: [PATCH] rename the CredentialInputSource related_names so they're plural --- awx/api/views/__init__.py | 2 +- awx/main/migrations/0067_v350_credential_plugins.py | 4 ++-- awx/main/models/credential/__init__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index 70e56fcb03..08b875c9a8 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -1468,7 +1468,7 @@ class CredentialInputSourceSubList(SubListCreateAttachDetachAPIView): model = models.CredentialInputSource serializer_class = serializers.CredentialInputSourceSerializer parent_model = models.Credential - relationship = 'input_source' + relationship = 'input_sources' parent_key = 'target_credential' diff --git a/awx/main/migrations/0067_v350_credential_plugins.py b/awx/main/migrations/0067_v350_credential_plugins.py index 427660b045..8d3a1f824f 100644 --- a/awx/main/migrations/0067_v350_credential_plugins.py +++ b/awx/main/migrations/0067_v350_credential_plugins.py @@ -35,9 +35,9 @@ class Migration(migrations.Migration): ('metadata', awx.main.fields.DynamicCredentialInputField(blank=True, default={})), ('created_by', models.ForeignKey(default=None, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name="{'class': 'credentialinputsource', 'model_name': 'credentialinputsource', 'app_label': 'main'}(class)s_created+", to=settings.AUTH_USER_MODEL)), ('modified_by', models.ForeignKey(default=None, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name="{'class': 'credentialinputsource', 'model_name': 'credentialinputsource', 'app_label': 'main'}(class)s_modified+", to=settings.AUTH_USER_MODEL)), - ('source_credential', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='target_input_source', to='main.Credential')), + ('source_credential', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='target_input_sources', to='main.Credential')), ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')), - ('target_credential', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='input_source', to='main.Credential')), + ('target_credential', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='input_sources', to='main.Credential')), ], ), migrations.AlterField( diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index 11578b397d..edc9de5372 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -1314,13 +1314,13 @@ class CredentialInputSource(PrimordialModel): target_credential = models.ForeignKey( 'Credential', - related_name='input_source', + related_name='input_sources', on_delete=models.CASCADE, null=True, ) source_credential = models.ForeignKey( 'Credential', - related_name='target_input_source', + related_name='target_input_sources', on_delete=models.CASCADE, null=True, )