Merge pull request #140 from magento-ogre/MAGETWO-54447

[Jackalopes] MAGETWO-54447, MAGETWO-50853
magento · Jul 7, 2016 · f7febb4 · f7febb4
2 parents 609be9d + 215652f
commit f7febb4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 49 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "0.1.1",
         "tubalmartin/cssmin": "2.4.8-p4",
-        "magento/magento-composer-installer": "*",
+        "magento/magento-composer-installer": ">=0.1.11",
         "braintree/braintree_php": "3.7.0",
         "symfony/console": "~2.3 <2.7",
         "symfony/event-dispatcher": "~2.1",

diff --git a/composer.lock b/composer.lock
diff --git a/setup/pub/magento/setup/install-extension-grid.js b/setup/pub/magento/setup/install-extension-grid.js
@@ -143,6 +143,7 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
                             version: extension.version
                         }
                     ];
+                    $localStorage.moduleName = extension.name;
                     $scope.error = false;
                     $scope.errorMessage = '';
                 }

diff --git a/setup/pub/magento/setup/select-version.js b/setup/pub/magento/setup/select-version.js
@@ -181,6 +181,7 @@ angular.module('select-version', ['ngStorage'])
                     $scope.packages.splice(1, $scope.totalForGrid);
                 }
             }
+            $localStorage.moduleName = '';
             $localStorage.packages = $scope.packages;
             $scope.nextState();
         };