Block structure fixes (#143, #148)

spicywebau · Nov 2, 2018 · eb7c20a · eb7c20a
1 parent ceb2ae0
commit eb7c20a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/elements/db/BlockQuery.php b/src/elements/db/BlockQuery.php
@@ -418,8 +418,6 @@ protected function beforePrepare(): bool
 			$this->subQuery->andWhere(Db::parseParam('neoblocks.typeId', $this->typeId));
 		}
 
-		$this->query->groupBy('{{elements}}.uid');
-
 		return parent::beforePrepare();
 	}
 

diff --git a/src/services/Fields.php b/src/services/Fields.php
@@ -217,6 +217,8 @@ public function saveValue(Field $field, ElementInterface $owner, bool $isNew)
 
 					if (!$hasBlocks)
 					{
+						$duplicatedBlocks = [];
+
 						foreach ($blocks as $block)
 						{
 							$duplicatedBlock = $elementsService->duplicateElement($block, [
@@ -226,7 +228,16 @@ public function saveValue(Field $field, ElementInterface $owner, bool $isNew)
 
 							$duplicatedBlock->setCollapsed($block->getCollapsed());
 							$duplicatedBlock->cacheCollapsed();
+							$duplicatedBlocks[] = $duplicatedBlock;
 						}
+
+						$duplicatedblockStructure = new BlockStructure();
+						$duplicatedblockStructure->fieldId = $field->id;
+						$duplicatedblockStructure->ownerId = $owner->id;
+						$duplicatedblockStructure->ownerSiteId = $ownerSiteId;
+
+						Neo::$plugin->blocks->saveStructure($duplicatedblockStructure);
+						Neo::$plugin->blocks->buildStructure($duplicatedBlocks, $duplicatedblockStructure);
 					}
 				}
 				else
@@ -329,6 +340,7 @@ private function _applyFieldTranslationSettings(int $ownerId, int $ownerSiteId,
 
 			if ($hasBlocks)
 			{
+				$blockStructure = Neo::$plugin->blocks->getStructure($fieldId, $ownerId);
 				$relatedElementFields = [];
 
 				foreach ($blocks as $block)
@@ -402,6 +414,9 @@ private function _applyFieldTranslationSettings(int $ownerId, int $ownerSiteId,
 					$block->ownerSiteId = $ownerSiteId;
 					$elementsService->saveElement($block, false);
 				}
+
+				$blockStructure->ownerSiteId = $ownerSiteId;
+				Neo::$plugin->blocks->saveStructure($blockStructure);
 			}
 		}
 		else