Update some inner-matrix service items

verbb · Oct 24, 2018 · 635e591 · 635e591
1 parent 8a275ba
commit 635e591
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/services/SuperTableMatrixService.php b/src/services/SuperTableMatrixService.php
@@ -171,8 +171,7 @@ public function getMatrixInputHtml($matrixField, $value, ElementInterface $eleme
         if ($value instanceof MatrixBlockQuery) {
             $value = $value
                 ->limit(null)
-                ->status(null)
-                ->enabledForSite(false)
+                ->anyStatus()
                 ->all();
         }
 
@@ -184,8 +183,7 @@ public function getMatrixInputHtml($matrixField, $value, ElementInterface $eleme
                 $block = new MatrixBlock();
                 $block->fieldId = $matrixField->id;
                 $block->typeId = $blockType->id;
-                $block->fieldLayoutId = $blockType->fieldLayoutId;
-                $block->siteId = $element->siteId;
+                $block->siteId = $element->siteId ?? Craft::$app->getSites()->getCurrentSite()->id;
                 $value[] = $block;
             }
         }
@@ -241,6 +239,9 @@ private function _getFieldOptionsForConfigurator(): array
             ];
         }
 
+        // Sort them by name
+        ArrayHelper::multisort($fieldTypes, 'name');
+
         Craft::$app->getView()->setNamespace($originalNamespace);
 
         return $fieldTypes;
@@ -261,7 +262,6 @@ private function _getBlockTypeInfoForInput($matrixField, ElementInterface $eleme
             $block = new MatrixBlock();
             $block->fieldId = $matrixField->id;
             $block->typeId = $blockType->id;
-            $block->fieldLayoutId = $blockType->fieldLayoutId;
 
             if ($element) {
                 $block->setOwner($element);