Merge pull request #1425 from magento-engcom/develop-prs

[EngCom] Public Pull Requests - MAGETWO-71743: Removed instantiating new driverpool class when it's already available. #10590 - MAGETWO-71742: Changed typos in class comment #10589 - MAGETWO-71705: fixed notice when remove column from grid #10579 - MAGETWO-71670: Fix issue #10565 #10575
magento · Aug 19, 2017 · d48faba · d48faba
2 parents adb30ab + 16006c5
commit d48faba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -314,7 +314,8 @@ public function removeColumn($columnId)
         if ($this->getColumnSet()->getChildBlock($columnId)) {
             $this->getColumnSet()->unsetChild($columnId);
             if ($this->_lastColumnId == $columnId) {
-                $this->_lastColumnId = array_pop($this->getColumnSet()->getChildNames());
+                $names = $this->getColumnSet()->getChildNames();
+                $this->_lastColumnId = array_pop($names);
             }
         }
         return $this;

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -52,7 +52,7 @@ define([
          * @param {Array} data - current component value
          */
         setPrepareToSendData: function (data) {
-            if (!data.length) {
+            if (_.isUndefined(data) || !data.length) {
                 data = '';
             }
 

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
@@ -52,6 +52,12 @@ define([
                 expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', '');
             });
 
+            it('Check method call with undefined as parameter.', function () {
+
+                expect(obj.setPrepareToSendData(undefined)).toBeUndefined();
+                expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', '');
+            });
+
             it('Check method call with array with data as parameter.', function () {
                 expect(obj.setPrepareToSendData(['1', '2', '3'])).toBeUndefined();
                 expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', ['1', '2', '3']);

diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -260,7 +260,7 @@ protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool,
                     new \Magento\Framework\Filesystem\Directory\WriteFactory($driverPool)
                 ),
                 new \Magento\Framework\Config\FileIteratorFactory(
-                    new \Magento\Framework\Filesystem\File\ReadFactory(new \Magento\Framework\Filesystem\DriverPool())
+                    new \Magento\Framework\Filesystem\File\ReadFactory($driverPool)
                 )
             );
             $schemaLocator = new \Magento\Framework\ObjectManager\Config\SchemaLocator();

diff --git a/lib/internal/Magento/Framework/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/Filesystem/DirectoryList.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Application file system directories dictionary
+ * Application file system directories dictionary.
  *
- * Provides information about what directories are available in the application
- * Serves as customizaiton point to specify different directories or add own
+ * Provides information about what directories are available in the application.
+ * Serves as a customization point to specify different directories or add your own.
  *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.