🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests: - #22422: Backport - Fix importFromArray by setting _isCollectionLoaded to true after import #21869 (by @slackerzz) - #22282: [Backport] Fixed "Please specify the admin custom URL" error on app:config:import CLI command (by @davidalger) Fixed GitHub Issues: - #21868: Method importFromArray from \Magento\Eav\Model\Entity\Collection\AbstractCollection doesn't return a working collection (reported by @slackerzz) has been fixed in #22422 by @slackerzz in 2.2-develop branch Related commits: 1. e1f91d1 - #15090: app:config:import fails with "Please specify the admin custom URL." (reported by @BlitzInternet) has been fixed in #22282 by @davidalger in 2.2-develop branch Related commits: 1. e12eeaa
magento · Apr 22, 2019 · a1daa45 · a1daa45
2 parents 14e5d75 + 499cdc1
commit a1daa45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
@@ -56,8 +56,9 @@ public function beforeSave()
     {
         $value = $this->getValue();
         if ($value == 1) {
-            $customUrl = $this->getData('groups/url/fields/custom/value');
-            if (empty($customUrl)) {
+            $customUrlField = $this->getData('groups/url/fields/custom/value');
+            $customUrlConfig = $this->_config->getValue('admin/url/custom');
+            if (empty($customUrlField) && empty($customUrlConfig)) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));
             }
         }

diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -1035,6 +1035,7 @@ public function importFromArray($arr)
                 $this->_items[$entityId]->addData($row);
             }
         }
+        $this->_setIsLoaded();
         return $this;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1035,6 +1035,7 @@ public function importFromArray($arr) @@
                     $this->_items[$entityId]->addData($row);
                 }
             }
+            $this->_setIsLoaded();
             return $this;
         }
@@ Expand Down @@