Fix disabled blocks being deleted #190

v2.2.5

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.5 - 2019-02-23
+### Fixed
+- Fixed issue in Neo 2.2.4 with disabled blocks being deleted when saving a Neo field's contents
+
 ## 2.2.4 - 2019-02-19
 ### Changed
 - Now supports filtering an entry draft's Neo field content with query parameters

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "spicyweb/craft-neo",
   "description": "A Matrix-like field type that uses existing fields",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "type": "craft-plugin",
   "keywords": [
     "cms",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-neo",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "A Matrix-like field type that uses existing fields",
   "main": "webpack.config.js",
   "scripts": {

src/Field.php

@@ -348,11 +348,18 @@ public function normalizeValue($value, ElementInterface $element = null)
 			{
 				$elements = $this->_createBlocksFromSerializedData($value, $element);
 
-				$query->anyStatus();
+				if (!Craft::$app->getRequest()->getIsLivePreview())
+				{
+					$query->anyStatus();
+				}
+				else
+				{
+					$query->status = Element::STATUS_ENABLED;
+				}
+
 				$query->limit = null;
 				$query->setCachedResult($elements);
-				$query->setAllElements($elements);
-				$query->useMemoized();
+				$query->useMemoized($elements);
 			}
 		}
 

src/elements/db/BlockQuery.php

@@ -5,7 +5,6 @@
 use yii\db\Connection;
 
 use Craft;
-use craft\base\Element;
 use craft\base\ElementInterface;
 use craft\db\Query;
 use craft\elements\db\ElementQuery;
@@ -252,10 +251,9 @@ public function typeId($value)
 	 */
 	public function count($q = '*', $db = null)
 	{
-		$isLivePreview = Craft::$app->getRequest()->getIsLivePreview();
 		$isUsingMemoized = $this->isUsingMemoized();
 
-		if (($isLivePreview || $isUsingMemoized) && isset($this->_allElements))
+		if ($isUsingMemoized && isset($this->_allElements))
 		{
 			$this->setCachedResult($this->_getFilteredResult());
 		}
@@ -268,10 +266,9 @@ public function count($q = '*', $db = null)
 	 */
 	public function all($db = null)
 	{
-		$isLivePreview = Craft::$app->getRequest()->getIsLivePreview();
 		$isUsingMemoized = $this->isUsingMemoized();
 
-		if (($isLivePreview || $isUsingMemoized) && isset($this->_allElements))
+		if ($isUsingMemoized && isset($this->_allElements))
 		{
 			$this->setCachedResult($this->_getFilteredResult());
 		}
@@ -284,10 +281,9 @@ public function all($db = null)
 	 */
 	public function one($db = null)
 	{
-		$isLivePreview = Craft::$app->getRequest()->getIsLivePreview();
 		$isUsingMemoized = $this->isUsingMemoized();
 
-		if (($isLivePreview || $isUsingMemoized) && isset($this->_allElements))
+		if ($isUsingMemoized && isset($this->_allElements))
 		{
 			$this->setCachedResult($this->_getFilteredResult());
 		}
@@ -300,10 +296,9 @@ public function one($db = null)
 	 */
 	public function nth(int $n, Connection $db = null)
 	{
-		$isLivePreview = Craft::$app->getRequest()->getIsLivePreview();
 		$isUsingMemoized = $this->isUsingMemoized();
 
-		if (($isLivePreview || $isUsingMemoized) && isset($this->_allElements))
+		if ($isUsingMemoized && isset($this->_allElements))
 		{
 			$this->setCachedResult($this->_getFilteredResult());
 		}
@@ -965,7 +960,7 @@ private function __status(array $elements, $value): array
 	{
 		if (!$value)
 		{
-			$value = Element::STATUS_ENABLED;
+			return $elements;
 		}
 
 		$newElements = array_filter($elements, function($element) use($value)