diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 16a1b9fe36..582d39630d 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -332,7 +332,7 @@ class BaseSerializer(serializers.ModelSerializer): 'description': role.description, } if len(roles) > 0: - summary_fields['roles'] = roles + summary_fields['object_roles'] = roles return summary_fields def get_created(self, obj): @@ -769,6 +769,7 @@ class UserSerializer(BaseSerializer): projects = reverse('api:user_projects_list', args=(obj.pk,)), credentials = reverse('api:user_credentials_list', args=(obj.pk,)), roles = reverse('api:user_roles_list', args=(obj.pk,)), + object_roles = reverse('api:user_object_roles_list', args=(obj.pk,)), activity_stream = reverse('api:user_activity_stream_list', args=(obj.pk,)), access_list = reverse('api:user_access_list', args=(obj.pk,)), )) @@ -826,7 +827,7 @@ 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,)), - roles = reverse('api:organization_roles_list', args=(obj.pk,)), + object_roles = reverse('api:organization_object_roles_list', args=(obj.pk,)), access_list = reverse('api:organization_access_list', args=(obj.pk,)), )) return res @@ -912,7 +913,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,)), + object_roles = reverse('api:project_object_roles_list', args=(obj.pk,)), )) if obj.organization: res['organization'] = reverse('api:organization_detail', @@ -1016,7 +1017,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,)), + object_roles = reverse('api:inventory_object_roles_list', args=(obj.pk,)), #single_fact = reverse('api:inventory_single_fact_view', args=(obj.pk,)), )) if obj.organization: @@ -1188,7 +1189,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,)), + object_roles = reverse('api:group_object_roles_list', args=(obj.pk,)), #single_fact = reverse('api:group_single_fact_view', args=(obj.pk,)), )) if obj.inventory: @@ -1287,7 +1288,7 @@ class CustomInventoryScriptSerializer(BaseSerializer): def get_related(self, obj): res = super(CustomInventoryScriptSerializer, self).get_related(obj) res.update(dict( - roles = reverse('api:inventory_script_roles_list', args=(obj.pk,)), + object_roles = reverse('api:inventory_script_object_roles_list', args=(obj.pk,)), )) if obj.organization: @@ -1456,6 +1457,7 @@ class TeamSerializer(BaseSerializer): users = reverse('api:team_users_list', args=(obj.pk,)), credentials = reverse('api:team_credentials_list', args=(obj.pk,)), roles = reverse('api:team_roles_list', args=(obj.pk,)), + object_roles = reverse('api:team_object_roles_list', args=(obj.pk,)), activity_stream = reverse('api:team_activity_stream_list', args=(obj.pk,)), access_list = reverse('api:team_access_list', args=(obj.pk,)), )) @@ -1638,7 +1640,7 @@ class CredentialSerializer(BaseSerializer): res.update(dict( activity_stream = reverse('api:credential_activity_stream_list', args=(obj.pk,)), access_list = reverse('api:credential_access_list', args=(obj.pk,)), - roles = reverse('api:credential_roles_list', args=(obj.pk,)), + object_roles = reverse('api:credential_object_roles_list', args=(obj.pk,)), )) parents = obj.owner_role.parents.exclude(object_id__isnull=True) @@ -1791,7 +1793,7 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer): access_list = reverse('api:job_template_access_list', args=(obj.pk,)), survey_spec = reverse('api:job_template_survey_spec', args=(obj.pk,)), labels = reverse('api:job_template_label_list', args=(obj.pk,)), - roles = reverse('api:job_template_roles_list', args=(obj.pk,)), + object_roles = reverse('api:job_template_object_roles_list', args=(obj.pk,)), )) if obj.host_config_key: res['callback'] = reverse('api:job_template_callback', args=(obj.pk,)) diff --git a/awx/api/urls.py b/awx/api/urls.py index 9ed4af3c70..d3ddea5b7a 100644 --- a/awx/api/urls.py +++ b/awx/api/urls.py @@ -25,7 +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]+)/object_roles/$', 'organization_object_roles_list'), url(r'^(?P[0-9]+)/access_list/$', 'organization_access_list'), ) @@ -38,6 +38,7 @@ user_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/projects/$', 'user_projects_list'), url(r'^(?P[0-9]+)/credentials/$', 'user_credentials_list'), url(r'^(?P[0-9]+)/roles/$', 'user_roles_list'), + url(r'^(?P[0-9]+)/object_roles/$', 'user_object_roles_list'), url(r'^(?P[0-9]+)/activity_stream/$', 'user_activity_stream_list'), url(r'^(?P[0-9]+)/access_list/$', 'user_access_list'), @@ -55,7 +56,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]+)/object_roles/$', 'project_object_roles_list'), url(r'^(?P[0-9]+)/access_list/$', 'project_access_list'), ) @@ -73,6 +74,7 @@ team_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/users/$', 'team_users_list'), url(r'^(?P[0-9]+)/credentials/$', 'team_credentials_list'), url(r'^(?P[0-9]+)/roles/$', 'team_roles_list'), + url(r'^(?P[0-9]+)/object_roles/$', 'team_object_roles_list'), url(r'^(?P[0-9]+)/activity_stream/$', 'team_activity_stream_list'), url(r'^(?P[0-9]+)/access_list/$', 'team_access_list'), ) @@ -92,7 +94,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]+)/object_roles/$', 'inventory_object_roles_list'), #url(r'^(?P[0-9]+)/single_fact/$', 'inventory_single_fact_view'), ) @@ -127,7 +129,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]+)/object_roles/$', 'group_object_roles_list'), #url(r'^(?P[0-9]+)/single_fact/$', 'group_single_fact_view'), ) @@ -155,7 +157,7 @@ inventory_update_urls = patterns('awx.api.views', inventory_script_urls = patterns('awx.api.views', url(r'^$', 'inventory_script_list'), url(r'^(?P[0-9]+)/$', 'inventory_script_detail'), - url(r'^(?P[0-9]+)/roles/$', 'inventory_script_roles_list'), + url(r'^(?P[0-9]+)/object_roles/$', 'inventory_script_object_roles_list'), ) credential_urls = patterns('awx.api.views', @@ -163,7 +165,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'), + url(r'^(?P[0-9]+)/object_roles/$', 'credential_object_roles_list'), # See also credentials resources on users/teams. ) @@ -189,7 +191,7 @@ job_template_urls = patterns('awx.api.views', url(r'^(?P[0-9]+)/notification_templates_error/$', 'job_template_notification_templates_error_list'), url(r'^(?P[0-9]+)/notification_templates_success/$', 'job_template_notification_templates_success_list'), url(r'^(?P[0-9]+)/access_list/$', 'job_template_access_list'), - url(r'^(?P[0-9]+)/roles/$', 'job_template_roles_list'), + url(r'^(?P[0-9]+)/object_roles/$', 'job_template_object_roles_list'), url(r'^(?P[0-9]+)/labels/$', 'job_template_label_list'), ) diff --git a/awx/api/views.py b/awx/api/views.py index 5ea5d5b6b1..93733904fa 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -820,7 +820,7 @@ class OrganizationAccessList(ResourceAccessList): resource_model = Organization new_in_300 = True -class OrganizationRolesList(SubListAPIView): +class OrganizationObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -877,6 +877,18 @@ class TeamRolesList(SubListCreateAttachDetachAPIView): return Response(data, status=status.HTTP_400_BAD_REQUEST) return super(TeamRolesList, self).post(request, *args, **kwargs) +class TeamObjectRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = Team + 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) + class TeamProjectsList(SubListAPIView): model = Project @@ -1097,7 +1109,7 @@ class ProjectAccessList(ResourceAccessList): resource_model = Project new_in_300 = True -class ProjectRolesList(SubListAPIView): +class ProjectObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -1182,6 +1194,17 @@ class UserRolesList(SubListCreateAttachDetachAPIView): # We hide roles that shouldn't be seen in our queryset return True +class UserObjectRolesList(SubListAPIView): + + model = Role + serializer_class = RoleSerializer + parent_model = User + 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) class UserProjectsList(SubListAPIView): @@ -1432,7 +1455,7 @@ class CredentialAccessList(ResourceAccessList): resource_model = Credential new_in_300 = True -class CredentialRolesList(SubListAPIView): +class CredentialObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -1464,7 +1487,7 @@ class InventoryScriptDetail(RetrieveUpdateDestroyAPIView): inv_src.save() return super(InventoryScriptDetail, self).destroy(request, *args, **kwargs) -class InventoryScriptRolesList(SubListAPIView): +class InventoryScriptObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -1526,7 +1549,7 @@ class InventoryAccessList(ResourceAccessList): resource_model = Inventory new_in_300 = True -class InventoryRolesList(SubListAPIView): +class InventoryObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -1873,7 +1896,7 @@ class GroupAccessList(ResourceAccessList): resource_model = Group new_in_300 = True -class GroupRolesList(SubListAPIView): +class GroupObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer @@ -2610,7 +2633,7 @@ class JobTemplateAccessList(ResourceAccessList): resource_model = JobTemplate new_in_300 = True -class JobTemplateRolesList(SubListAPIView): +class JobTemplateObjectRolesList(SubListAPIView): model = Role serializer_class = RoleSerializer