Skip to content

Commit 0b10220

Browse files
authored
Merge pull request #430 from ponas/fix/djangoobjecttype-fields-exclude
Fix DjangoObjectType deprecation warnings
2 parents 5c8f8a7 + 552d800 commit 0b10220

7 files changed

Lines changed: 16 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Unreleased
22

3+
### Fixed
4+
5+
- Declare explicit `fields`/`exclude` on `DjangoObjectType` subclasses to silence graphene-django deprecation warnings ([#430](https://github.com/torchbox/wagtail-grapple/pull/430)) @ponas
6+
37
## [0.31.0] - 2026-04-21
48

59
### Added

grapple/actions.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ class UnmanagedMeta:
267267

268268
class StubMeta:
269269
model = stub_model
270+
fields = "__all__"
270271

271272
# Gather any interfaces, and discard None values
272273
interface_classes = getattr(cls, "graphql_interfaces", ())
@@ -311,7 +312,7 @@ class Meta:
311312

312313
type_meta = {"Meta": Meta, "id": graphene.ID(), "name": type_name}
313314

314-
exclude_fields = []
315+
exclude = []
315316
base_type_for_exclusion_checks = (
316317
base_type if not issubclass(cls, WagtailPage) else WagtailPage
317318
)
@@ -326,7 +327,7 @@ class Meta:
326327
):
327328
continue
328329

329-
exclude_fields.append(field)
330+
exclude.append(field)
330331

331332
# Add any custom fields to node if they are defined.
332333
methods = {}
@@ -340,14 +341,14 @@ class Meta:
340341
type_meta[field.field_name] = field_type
341342

342343
# Remove field from excluded list
343-
if field.field_name in exclude_fields:
344-
exclude_fields.remove(field.field_name)
344+
if field.field_name in exclude:
345+
exclude.remove(field.field_name)
345346

346347
# Add a custom resolver for each field
347348
methods[f"resolve_{field.field_name}"] = model_resolver(field)
348349

349350
# Replace stud node with real thing
350-
type_meta["Meta"].exclude_fields = exclude_fields
351+
type_meta["Meta"].exclude = exclude
351352
node = type(type_name, (base_type,), type_meta)
352353

353354
# Add custom resolvers for fields

grapple/types/collections.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class CollectionObjectType(DjangoObjectType):
1515

1616
class Meta:
1717
model = Collection
18+
fields = "__all__"
1819

1920
id = graphene.ID(required=True)
2021
name = graphene.String(required=True)

grapple/types/documents.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def resolve_tags(self, info, **kwargs):
3838

3939
class Meta:
4040
model = WagtailDocument
41+
fields = "__all__"
4142

4243

4344
def get_document_type():

grapple/types/images.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ class ImageRenditionObjectType(DjangoObjectType):
9595

9696
class Meta:
9797
model = WagtailImageRendition
98+
fields = "__all__"
9899

99100
def resolve_url(
100101
instance: WagtailImageRendition, info: GraphQLResolveInfo, **kwargs
@@ -127,6 +128,7 @@ class ImageObjectType(DjangoObjectType):
127128

128129
class Meta:
129130
model = WagtailImage
131+
fields = "__all__"
130132

131133
def resolve_rendition(
132134
instance: WagtailImage, info: GraphQLResolveInfo, **kwargs

grapple/types/pages.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Page(DjangoObjectType):
2323
class Meta:
2424
model = WagtailPage
2525
interfaces = (get_page_interface(),)
26+
fields = "__all__"
2627

2728

2829
def get_preview_page(token):

grapple/types/sites.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def resolve_page(self, info, **kwargs):
6464

6565
class Meta:
6666
model = Site
67+
fields = "__all__"
6768

6869

6970
def SitesQuery():

0 commit comments

Comments
 (0)