Skip to content

Commit

Permalink
fixup! Port GraphQLView to Graphene 3
Browse files Browse the repository at this point in the history
  • Loading branch information
ktosiek committed Sep 16, 2019
1 parent 7cd43d2 commit a272c20
Showing 1 changed file with 13 additions and 16 deletions.
29 changes: 13 additions & 16 deletions graphene_django/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,22 +256,19 @@ def execute_graphql_request(
)
)

try:
validation_errors = validate(self.schema.graphql_schema, document)
if validation_errors:
return ExecutionResult(data=None, errors=validation_errors)

return execute(
schema=self.schema.graphql_schema,
document=document,
root_value=self.get_root_value(request),
variable_values=variables,
operation_name=operation_name,
context_value=self.get_context(request),
middleware=self.get_middleware(request),
)
except Exception as e:
return ExecutionResult(errors=[e])
validation_errors = validate(self.schema.graphql_schema, document)
if validation_errors:
return ExecutionResult(data=None, errors=validation_errors)

return execute(
schema=self.schema.graphql_schema,
document=document,
root_value=self.get_root_value(request),
variable_values=variables,
operation_name=operation_name,
context_value=self.get_context(request),
middleware=self.get_middleware(request),
)

@classmethod
def can_display_graphiql(cls, request, data):
Expand Down

0 comments on commit a272c20

Please sign in to comment.