diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 08098b0f04..46bcfcb20d 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -805,7 +805,8 @@ class OrganizationSerializer(BaseSerializer): notification_templates_any = reverse('api:organization_notification_templates_any_list', args=(obj.pk,)), notification_templates_success = reverse('api:organization_notification_templates_success_list', args=(obj.pk,)), notification_templates_error = reverse('api:organization_notification_templates_error_list', args=(obj.pk,)), - access_list = reverse('api:organization_access_list', args=(obj.pk,)), + roles = reverse('api:organization_roles_list', args=(obj.pk,)), + access_list = reverse('api:organization_access_list', args=(obj.pk,)), )) return res @@ -890,6 +891,7 @@ class ProjectSerializer(UnifiedJobTemplateSerializer, ProjectOptionsSerializer): notification_templates_success = reverse('api:project_notification_templates_success_list', args=(obj.pk,)), notification_templates_error = reverse('api:project_notification_templates_error_list', args=(obj.pk,)), access_list = reverse('api:project_access_list', args=(obj.pk,)), + roles = reverse('api:project_roles_list', args=(obj.pk,)), )) if obj.organization: res['organization'] = reverse('api:organization_detail', @@ -993,6 +995,7 @@ class InventorySerializer(BaseSerializerWithVariables): scan_job_templates = reverse('api:inventory_scan_job_template_list', args=(obj.pk,)), ad_hoc_commands = reverse('api:inventory_ad_hoc_commands_list', args=(obj.pk,)), access_list = reverse('api:inventory_access_list', args=(obj.pk,)), + roles = reverse('api:inventory_roles_list', args=(obj.pk,)), #single_fact = reverse('api:inventory_single_fact_view', args=(obj.pk,)), )) if obj.organization: @@ -1164,6 +1167,7 @@ class GroupSerializer(BaseSerializerWithVariables): inventory_sources = reverse('api:group_inventory_sources_list', args=(obj.pk,)), ad_hoc_commands = reverse('api:group_ad_hoc_commands_list', args=(obj.pk,)), access_list = reverse('api:group_access_list', args=(obj.pk,)), + roles = reverse('api:group_roles_list', args=(obj.pk,)), #single_fact = reverse('api:group_single_fact_view', args=(obj.pk,)), )) if obj.inventory: @@ -1625,7 +1629,8 @@ class CredentialSerializer(BaseSerializer): res = super(CredentialSerializer, self).get_related(obj) res.update(dict( activity_stream = reverse('api:credential_activity_stream_list', args=(obj.pk,)), - access_list = reverse('api:credential_access_list', args=(obj.pk,)), + access_list = reverse('api:credential_access_list', args=(obj.pk,)), + roles = reverse('api:credential_roles_list', args=(obj.pk,)), )) parents = obj.owner_role.parents.exclude(object_id__isnull=True) diff --git a/awx/api/urls.py b/awx/api/urls.py index 7759b4a609..c05cf30366 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -25,6 +25,7 @@ organization_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/notification_templates_any/$', 'organization_notification_templates_any_list'), url(r'^(?P[0-9]+)/notification_templates_error/$', 'organization_notification_templates_error_list'), url(r'^(?P[0-9]+)/notification_templates_success/$', 'organization_notification_templates_success_list'), + url(r'^(?P[0-9]+)/roles/$', 'organization_roles_list'), url(r'^(?P[0-9]+)/access_list/$', 'organization_access_list'), ) @@ -39,6 +40,7 @@ user_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/roles/$', 'user_roles_list'), url(r'^(?P[0-9]+)/activity_stream/$', 'user_activity_stream_list'), url(r'^(?P[0-9]+)/access_list/$', 'user_access_list'), + ) project_urls = patterns('awx.api.views', @@ -53,6 +55,7 @@ project_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/notification_templates_any/$', 'project_notification_templates_any_list'), url(r'^(?P[0-9]+)/notification_templates_error/$', 'project_notification_templates_error_list'), url(r'^(?P[0-9]+)/notification_templates_success/$', 'project_notification_templates_success_list'), + url(r'^(?P[0-9]+)/roles/$', 'project_roles_list'), url(r'^(?P[0-9]+)/access_list/$', 'project_access_list'), ) @@ -89,6 +92,7 @@ inventory_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/scan_job_templates/$', 'inventory_scan_job_template_list'), url(r'^(?P[0-9]+)/ad_hoc_commands/$', 'inventory_ad_hoc_commands_list'), url(r'^(?P[0-9]+)/access_list/$', 'inventory_access_list'), + url(r'^(?P[0-9]+)/roles/$', 'inventory_roles_list'), #url(r'^(?P[0-9]+)/single_fact/$', 'inventory_single_fact_view'), ) @@ -123,6 +127,7 @@ group_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/inventory_sources/$', 'group_inventory_sources_list'), url(r'^(?P[0-9]+)/ad_hoc_commands/$', 'group_ad_hoc_commands_list'), url(r'^(?P[0-9]+)/access_list/$', 'group_access_list'), + url(r'^(?P[0-9]+)/roles/$', 'group_roles_list'), #url(r'^(?P[0-9]+)/single_fact/$', 'group_single_fact_view'), ) @@ -157,6 +162,7 @@ credential_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/activity_stream/$', 'credential_activity_stream_list'), url(r'^(?P[0-9]+)/$', 'credential_detail'), url(r'^(?P[0-9]+)/access_list/$', 'credential_access_list'), + url(r'^(?P[0-9]+)/roles/$', 'credential_roles_list'), # See also credentials resources on users/teams. ) diff --git a/awx/api/views.py b/awx/api/views.py index cca55961ea..c7b471ddd6 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -799,6 +799,18 @@ class OrganizationAccessList(ResourceAccessList): resource_model = Organization new_in_300 = True +class OrganizationRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Organization + new_in_300 = True + + def get_queryset(self): + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() + class TeamList(ListCreateAPIView): model = Team @@ -1064,6 +1076,18 @@ class ProjectAccessList(ResourceAccessList): resource_model = Project new_in_300 = True +class ProjectRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Project + new_in_300 = True + + def get_queryset(self): + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() + class UserList(ListCreateAPIView): model = User @@ -1359,6 +1383,18 @@ class CredentialAccessList(ResourceAccessList): resource_model = Credential new_in_300 = True +class CredentialRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Credential + new_in_300 = True + + def get_queryset(self): + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() + class InventoryScriptList(ListCreateAPIView): model = CustomInventoryScript @@ -1429,6 +1465,18 @@ class InventoryAccessList(ResourceAccessList): resource_model = Inventory new_in_300 = True +class InventoryRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Inventory + new_in_300 = True + + def get_queryset(self): + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() + class InventoryJobTemplateList(SubListAPIView): model = JobTemplate @@ -1764,6 +1812,18 @@ class GroupAccessList(ResourceAccessList): resource_model = Group new_in_300 = True +class GroupRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Group + new_in_300 = True + + def get_queryset(self): + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() + class InventoryGroupsList(SubListCreateAttachDetachAPIView): @@ -2488,9 +2548,9 @@ class JobTemplateRolesList(SubListAPIView): new_in_300 = True def get_queryset(self): - jt = self.get_parent_object() - content_type = ContentType.objects.get_for_model(JobTemplate) - return Role.objects.filter(content_type=content_type, object_id=jt.pk).all() + po = self.get_parent_object() + content_type = ContentType.objects.get_for_model(self.parent_model) + return Role.objects.filter(content_type=content_type, object_id=po.pk).all() class SystemJobTemplateList(ListAPIView):