🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit fe11b39389dd · 2018-07-30T15:57:28.000+03:00
Accepted Public Pull Requests: - #17259: [Forwardport] Using interface instead of model directly (by @mage2pratik) - magento-engcom/import-export-improvements#111: magento-engcom/import-export-improvements#58: Fix generation of import url (by @dmanners) - #16897: [Forwardport] Prevent running SQL query on every item in the database when the quote is empty (by @mage2pratik)
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -178,9 +178,13 @@ require([
                 .loader('show');
             var form = jQuery('#edit_form')
                 .one('invalid-form.validate', function(e){jQuery('body').loader('hide')});
-            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action')) +
-                (form.attr('action').lastIndexOf('?') != -1 ? '&' : '?')+
-                'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+
+            newActionUrl = (newActionUrl ? newActionUrl : form.attr('action'));
+            if (newActionUrl.lastIndexOf('form_key') === -1) {
+                newActionUrl = newActionUrl +
+                    (newActionUrl.lastIndexOf('?') !== -1 ? '&' : '?') +
+                    'form_key=' + encodeURIComponent(form.find('[name="form_key"]').val());
+            }
 
             form.trigger('save', [{
                 action: newActionUrl,
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -323,6 +323,10 @@ private function addTierPriceData(ProductCollection $productCollection)
      */
     private function removeItemsWithAbsentProducts()
     {
+        if (count($this->_productIds) === 0) {
+            return;
+        }
+
         $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
         $existingProductsIds = $productCollection->getAllIds();
         $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
@@ -69,7 +69,7 @@
     </type>
     <type name="Magento\Framework\App\Area">
         <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="translator" xsi:type="object">Magento\Framework\TranslateInterface</argument>
             <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
         </arguments>
     </type>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <meta name="robots" content="NOINDEX,NOFOLLOW"/>
         <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>
