External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 16:58:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

make applications name-unique

Browse Source
This commit is contained in:
AlanCoding
2018-07-16 14:58:26 -04:00
parent 62967b2806
commit 885ea2c5e1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/migrations/0030_v330_modify_application.py
View File

@@ -20,4 +20,8 @@ class Migration(migrations.Migration):
name='organization', name='organization',
field=models.ForeignKey(help_text='Organization containing this application.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='applications', to='main.Organization'), field=models.ForeignKey(help_text='Organization containing this application.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='applications', to='main.Organization'),
), ),
migrations.AlterUniqueTogether(
name='oauth2application',
unique_together=set([('name', 'organization')]),
),
] ]

1
awx/main/models/oauth.py
View File

@@ -27,6 +27,7 @@ class OAuth2Application(AbstractApplication):
class Meta: class Meta:
app_label = 'main' app_label = 'main'
verbose_name = _('application') verbose_name = _('application')
unique_together = (("name", "organization"),)
CLIENT_CONFIDENTIAL = "confidential" CLIENT_CONFIDENTIAL = "confidential"
CLIENT_PUBLIC = "public" CLIENT_PUBLIC = "public"

4
awx/main/tests/functional/test_rbac_oauth.py
View File

@@ -79,7 +79,7 @@ class TestOAuth2Application:
can_access_list = [True, True, False, False] can_access_list = [True, True, False, False]
for user, can_access in zip(user_list, can_access_list): for user, can_access in zip(user_list, can_access_list):
app = Application.objects.create( app = Application.objects.create(
name='test app for {}'.format(org_admin.username), user=org_admin, name='test app for {}'.format(user.username), user=org_admin,
client_type='confidential', authorization_grant_type='password', organization=organization client_type='confidential', authorization_grant_type='password', organization=organization
) )
access = OAuth2ApplicationAccess(user) access = OAuth2ApplicationAccess(user)
@@ -94,7 +94,7 @@ class TestOAuth2Application:
can_access_list = [True, True, False, False] can_access_list = [True, True, False, False]
for user, can_access in zip(user_list, can_access_list): for user, can_access in zip(user_list, can_access_list):
app = Application.objects.create( app = Application.objects.create(
name='test app for {}'.format(admin.username), user=admin, name='test app for {}'.format(user.username), user=admin,
client_type='confidential', authorization_grant_type='password', organization=organization client_type='confidential', authorization_grant_type='password', organization=organization
) )
access = OAuth2ApplicationAccess(user) access = OAuth2ApplicationAccess(user)