Merge pull request #23 from venveo/bugfix/broken-entry-field-layouts

Fix field layout determination for entries

Author: Mosnar

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bulk Edit Changelog
 
+## 2.0.3 - 2020-02-24
+### Fixed
+- Bug where bulk editing a section with a field layout that had been deleted could yield no fields
+
 ## 2.0.2.1 - 2020-02-20
 ### Fixed
 - Error that can occur if trying to bulkedit fields on a soft-deleted layout

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "venveo/craft-bulkedit",
-    "description": "Bulk edit entries",
+    "description": "Bulk edit Craft CMS element fields",
     "type": "craft-plugin",
-    "version": "2.0.2.1",
+    "version": "2.0.3",
     "keywords": [
         "craft",
         "cms",

src/elements/processors/EntryProcessor.php

@@ -21,17 +21,16 @@ class EntryProcessor extends AbstractElementTypeProcessor
      */
     public static function getLayoutsFromElementIds($elementIds): array
     {
-        $layouts = FieldLayout::find()
-            ->select('fieldlayouts.*')
+        $types = \craft\records\Entry::find()
+            ->select('entrytypes.fieldLayoutId')
             ->distinct(true)
             ->limit(null)
-            ->from('{{%fieldlayouts}} fieldlayouts')
-            ->leftJoin('{{%elements}} elements', '[[elements.fieldLayoutId]] = [[fieldlayouts.id]]')
-            ->where(['IN', '[[elements.id]]', $elementIds])
-            ->andWhere(['=','fieldlayouts.dateDeleted', null])
-            ->all();
+            ->from('{{%entries}} entries')
+            ->leftJoin('{{%entrytypes}} entrytypes', '[[entries.typeId]] = [[entrytypes.id]]')
+            ->where(['IN', '[[entries.id]]', $elementIds])
+            ->column();
 
-        return $layouts;
+        return FieldLayout::find()->where(['IN', '[[id]]', $types])->all();
     }
 
     /**