First pass of role definition optimizations

Author: AlanCoding

ansible_base/rbac/api/views.py

@@ -107,7 +107,7 @@ class RoleDefinitionViewSet(AnsibleBaseDjangoAppApiView, ModelViewSet):
     but can be assigned to users.
     """
 
-    queryset = RoleDefinition.objects.prefetch_related('created_by', 'modified_by', 'content_type', 'permissions')
+    queryset = RoleDefinition.objects.prefetch_related('created_by', 'modified_by', 'content_type', 'permissions', 'resource')
     serializer_class = RoleDefinitionSerializer
     permission_classes = try_add_oauth2_scope_permission([RoleDefinitionPermissions])
 

ansible_base/resource_registry/models/resource.py

@@ -95,11 +95,11 @@ def summary_fields(self):
 
     @property
     def resource_type(self):
-        return resource_type_cache(self.content_type.pk).name
+        return resource_type_cache(self.content_type_id).name
 
     @property
     def resource_type_obj(self):
-        return resource_type_cache(self.content_type.pk)
+        return resource_type_cache(self.content_type_id)
 
     class Meta:
         unique_together = ('content_type', 'object_id')