Fix flake8 and simpler type ct calc

Author: AlanCoding

ansible_base/rbac/models/fields.py

@@ -9,7 +9,7 @@
 from django.db.models.sql import AND
 from django.db.models.sql.where import WhereNode
 
-from ..remote import get_local_resource_prefix, get_remote_standin_class
+from ..remote import get_local_resource_prefix
 from .content_type import DABContentType
 
 

ansible_base/rbac/remote.py

@@ -34,7 +34,7 @@ def get_ct_from_type(cls):
         if not hasattr(cls, '_meta'):
             raise ValueError('Generlized RemoteObject can not obtain content_type from its class')
         ct_model = apps.get_model('dab_rbac', 'DABContentType')
-        return ct_model.objects.get_by_natural_key(cls._meta.service, cls._meta.app_label, cls._meta.model)
+        return ct_model.objects.get_by_natural_key(cls._meta.service, cls._meta.app_label, cls._meta.model_name)
 
 
 def get_remote_base_class() -> Type[RemoteObject]:
@@ -118,7 +118,7 @@ def __init__(self, ct: models.Model):
         standin = type(
             name,
             (base,),
-            {"_meta": StandinMeta(content_type), "type_data": (content_type.service, content_type.app_label, content_type.model)},
+            {"_meta": StandinMeta(content_type)},
         )
         _REMOTE_STANDIN_CACHE[key] = standin
     return standin

ansible_base/rbac/validators.py

@@ -46,11 +46,9 @@ def permissions_allowed_for_system_role() -> dict[Type[Model], list[str]]:
 
 def permissions_allowed_for_remote_cls(cls: Type[RemoteObject]) -> dict[Union[Type[Model], Type[RemoteObject]], list[str]]:
     "Model is on remote server, return valid permissions via the content type definitions"
-    from .models.content_type import DABContentType
-
     permissions_by_model = defaultdict(list)
     # Add permissions for the current type
-    cls_ct = DABContentType.objects.get_by_natural_key(*cls.type_data)
+    cls_ct = cls.get_ct_from_type()
     for permission in cls_ct.dab_permissions.all():
         if not is_add_perm(permission.codename):
             permissions_by_model[cls].append(permission.codename)
@@ -120,7 +118,7 @@ def check_view_permission_criteria(codename_set: set[str], permissions_by_model:
         # if issubclass(cls, RemoteObject):
         #     from .models.content_type import DABContentType
 
-        #     cls_ct = DABContentType.objects.get_by_natural_key(*cls.type_data)
+        #     cls_ct = cls.get_ct_from_type()
         #     if any(permission.codename.startswith('view') for permission in cls_ct.permissions.all()):
         if any('view' in codename for codename in valid_model_permissions):
             model_permissions = set(valid_model_permissions) & codename_set