Просмотр исходного кода

Omit _path from CableTermination models

jeremystretch 4 лет назад
Родитель
Сommit
2fe734e6f9
2 измененных файлов с 6 добавлено и 9 удалено
  1. 6 6
      netbox/dcim/graphql/types.py
  2. 0 3
      netbox/utilities/testing/api.py

+ 6 - 6
netbox/dcim/graphql/types.py

@@ -56,7 +56,7 @@ class ConsolePortType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.ConsolePort
         model = models.ConsolePort
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.ConsolePortFilterSet
         filterset_class = filtersets.ConsolePortFilterSet
 
 
     def resolve_type(self, info):
     def resolve_type(self, info):
@@ -78,7 +78,7 @@ class ConsoleServerPortType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.ConsoleServerPort
         model = models.ConsoleServerPort
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.ConsoleServerPortFilterSet
         filterset_class = filtersets.ConsoleServerPortFilterSet
 
 
     def resolve_type(self, info):
     def resolve_type(self, info):
@@ -162,7 +162,7 @@ class InterfaceType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.Interface
         model = models.Interface
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.InterfaceFilterSet
         filterset_class = filtersets.InterfaceFilterSet
 
 
     def resolve_mode(self, info):
     def resolve_mode(self, info):
@@ -213,7 +213,7 @@ class PowerFeedType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.PowerFeed
         model = models.PowerFeed
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.PowerFeedFilterSet
         filterset_class = filtersets.PowerFeedFilterSet
 
 
 
 
@@ -221,7 +221,7 @@ class PowerOutletType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.PowerOutlet
         model = models.PowerOutlet
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.PowerOutletFilterSet
         filterset_class = filtersets.PowerOutletFilterSet
 
 
     def resolve_feed_leg(self, info):
     def resolve_feed_leg(self, info):
@@ -257,7 +257,7 @@ class PowerPortType(TaggedObjectType):
 
 
     class Meta:
     class Meta:
         model = models.PowerPort
         model = models.PowerPort
-        fields = '__all__'
+        exclude = ('_path',)
         filterset_class = filtersets.PowerPortFilterSet
         filterset_class = filtersets.PowerPortFilterSet
 
 
     def resolve_type(self, info):
     def resolve_type(self, info):

+ 0 - 3
netbox/utilities/testing/api.py

@@ -446,9 +446,6 @@ class APIViewTestCases:
             # Compile list of fields to include
             # Compile list of fields to include
             fields_string = ''
             fields_string = ''
             for field_name, field in type_class._meta.fields.items():
             for field_name, field in type_class._meta.fields.items():
-                # TODO: Omit "hidden" fields from GraphQL types
-                if field_name.startswith('_'):
-                    continue
                 if type(field) is Dynamic:
                 if type(field) is Dynamic:
                     # Dynamic fields must specify a subselection
                     # Dynamic fields must specify a subselection
                     fields_string += f'{field_name} {{ id }}\n'
                     fields_string += f'{field_name} {{ id }}\n'