Merge pull request #34 from venveo/develop

Fix some bugs with multi-site element selects

Author: Mosnar

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Bulk Edit Changelog
 
+## 2.0.6 - 2021-07-22
+### Fixed
+- Fixed a bug where fields may not always get the correct source site ID
+
+### Other
+- Tested on Craft 3.7
+
 ## 2.0.5
 ### Fixed
 - Bug where multi-site bulk editing was not working properly (Thanks @monachilada)

composer.json

@@ -2,7 +2,7 @@
     "name": "venveo/craft-bulkedit",
     "description": "Bulk edit Craft CMS element fields",
     "type": "craft-plugin",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "keywords": [
         "craft",
         "cms",

src/base/AbstractElementTypeProcessor.php

@@ -15,7 +15,8 @@ public static function getEditableAttributes(): array
     public static function getMockElement($elementIds = [], $params = []): Element
     {
         /** @var Element $elementPlaceholder */
-        $elementPlaceholder = Craft::createObject(static::getType(), $params);
+        $params['type'] = static::getType();
+        $elementPlaceholder = Craft::$app->elements->createElement($params);
         return $elementPlaceholder;
     }
 }

src/elements/processors/AssetProcessor.php

@@ -66,9 +66,8 @@ public static function hasPermission($elementIds, User $user): bool
 
     public static function getMockElement($elementIds = [], $params = []): Element
     {
-        $asset = Craft::$app->assets->getAssetById($elementIds[0]);
-        /** @var Asset $elementPlaceholder */
-        $elementPlaceholder = Craft::createObject(static::getType(), $params);
+        $elementPlaceholder = parent::getMockElement($elementIds, $params);
+        $asset = Craft::$app->assets->getAssetById($elementIds[0], $params['siteId']);
         // Field availability is determined by volume ID
         $elementPlaceholder->volumeId = $asset->volumeId;
         return $elementPlaceholder;

src/elements/processors/CategoryProcessor.php

@@ -66,9 +66,9 @@ public static function hasPermission($elementIds, User $user): bool
 
     public static function getMockElement($elementIds = [], $params = []): Element
     {
-        $category = Craft::$app->categories->getCategoryById($elementIds[0]);
+        $elementPlaceholder = parent::getMockElement($elementIds, $params);
+        $category = Craft::$app->categories->getCategoryById($elementIds[0], $params['siteId']);
         /** @var Category $elementPlaceholder */
-        $elementPlaceholder = Craft::createObject(static::getType(), $params);
         // Field availability is determined by volume ID
         $elementPlaceholder->groupId = $category->groupId;
         return $elementPlaceholder;

src/elements/processors/EntryProcessor.php

@@ -77,11 +77,10 @@ public static function getEditableAttributes(): array {
      */
     public static function getMockElement($elementIds = [], $params = []): Element
     {
+        $elementPlaceholder = parent::getMockElement($elementIds, $params);
         $templateEntry = Craft::$app->entries->getEntryById($elementIds[0], $params['siteId']);
-        /** @var Entry $entry */
-        $entry = Craft::createObject(self::getType(), $params);
-        $entry->typeId = $templateEntry->typeId;
-        $entry->sectionId = $templateEntry->sectionId;
-        return $entry;
+        $elementPlaceholder->typeId = $templateEntry->typeId;
+        $elementPlaceholder->sectionId = $templateEntry->sectionId;
+        return $elementPlaceholder;
     }
 }

src/elements/processors/ProductProcessor.php

@@ -66,10 +66,10 @@ public static function hasPermission($elementIds, User $user): bool
 
     public static function getMockElement($elementIds = [], $params = []): Element
     {
+        $elementPlaceholder = parent::getMockElement($elementIds, $params);
         /** @var \craft\commerce\elements\Product $product */
-        $product = \Craft::$app->elements->getElementById($elementIds[0], \craft\commerce\elements\Product::class);
+        $product = \Craft::$app->elements->getElementById($elementIds[0], \craft\commerce\elements\Product::class, $params['siteId']);
         /** @var \craft\commerce\elements\Product $elementPlaceholder */
-        $elementPlaceholder = Craft::createObject(static::getType(), $params);
         // Field availability is determined by volume ID
         $elementPlaceholder->typeId = $product->typeId;
         return $elementPlaceholder;