Merge pull request #33 from ezsystems/ezp30419-fix_multiple_groups

Fixed a schema error when type in multiple groups (EZP-30419)
ezsystems · Apr 12, 2019 · 15f1b54 · 15f1b54
2 parents 480dd89 + 251cb53
commit 15f1b54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Schema/Domain/Content/Worker/ContentType/DefineDomainContentMutation.php b/src/Schema/Domain/Content/Worker/ContentType/DefineDomainContentMutation.php
@@ -104,7 +104,8 @@ public function canWork(Builder $schema, array $args)
     {
         return isset($args['ContentType'])
                && $args['ContentType'] instanceof ContentType
-               && !isset($args['FieldDefinition']);
+               && !isset($args['FieldDefinition'])
+               && !$schema->hasType($this->getCreateInputName($args['ContentType']));
     }
 
     /**

diff --git a/...chema/Domain/Content/Worker/FieldDefinition/AddFieldDefinitionToDomainContentMutation.php b/...chema/Domain/Content/Worker/FieldDefinition/AddFieldDefinitionToDomainContentMutation.php
@@ -55,7 +55,8 @@ public function canWork(Builder $schema, array $args): bool
             isset($args['ContentType'])
             && $args['ContentType'] instanceof ContentType
             && isset($args['FieldDefinition'])
-            && $args['FieldDefinition'] instanceof FieldDefinition;
+            && $args['FieldDefinition'] instanceof FieldDefinition
+            && !$schema->hasTypeWithField($this->getCreateInputName($args['ContentType']), $this->getFieldDefinitionField($args['FieldDefinition']));
     }
 
     /**