Merge remote-tracking branch 'origin/MAGETWO-51175-Install-Extensions' into PR_Branch

Author: monkeysee

setup/src/Magento/Setup/Controller/ComponentGrid.php

@@ -152,18 +152,18 @@ public function componentsAction()
     public function syncAction()
     {
         $error = '';
+        $packagesForInstall = [];
+        $lastSyncData = [];
         try {
             $this->updatePackagesCache->syncPackagesForUpdate();
             $lastSyncData = $this->updatePackagesCache->getPackagesForUpdate();
 
             $this->marketplaceManager->syncPackagesForInstall();
             $packagesForInstall = $this->marketplaceManager->getPackagesForInstall();
+            $lastSyncData = $this->formatLastSyncData($packagesForInstall, $lastSyncData);
         } catch (\Exception $e) {
             $error = $e->getMessage();
         }
-
-        $lastSyncData = $this->formatLastSyncData($packagesForInstall, $lastSyncData);
-
         return new \Zend\View\Model\JsonModel(
             [
                 'success' => true,

setup/src/Magento/Setup/Model/MarketplaceManager.php

@@ -161,14 +161,18 @@ public function syncPackagesForInstall()
             }
             $packageNames = array_column($this->getComposerInformation()->getInstalledMagentoPackages(), 'name');
             $installPackages = [];
-            foreach ($packagesJsonData['packages'] as $package) {
-                $package = $this->unsetDevVersions($package);
-                if (!empty($package)) {
+            foreach ($packagesJsonData['packages'] as $packageName => $package) {
+                if (!empty($package) && isset($package) && is_array($package)) {
+                    $package = $this->unsetDevVersions($package);
                     ksort($package);
-                    $package = array_pop($package);
-                    if ($this->isNewUserPackage($package, $packageNames)) {
-                        $package['vendor'] = explode('/', $package['name'])[0];
-                        $installPackages[$package['name']] = $package;
+                    $packageValues = array_values($package);
+                    if ($this->isNewUserPackage($packageValues[0], $packageNames)) {
+                        $versions = array_reverse(array_keys($package));
+                        $installPackage = $packageValues[0];
+                        $installPackage['versions'] = $versions;
+                        $installPackage['name'] = $packageName;
+                        $installPackage['vendor'] = explode('/', $packageName)[0];
+                        $installPackages[$packageName] = $installPackage;
                     }
                 }
             }
@@ -360,6 +364,7 @@ public function getPackagesForInstall()
                     $package['metapackage'] =
                         isset($metaPackageByPackage[$package['name']]) ? $metaPackageByPackage[$package['name']] : '';
                     $actualInstallackages[$package['name']] = $package;
+                    $actualInstallackages[$package['name']]['version'] = $package['versions'][0];
                 }
             }
             $installPackagesInfo['packages'] = $actualInstallackages;

setup/view/magento/setup/install-extension-grid.phtml

@@ -65,18 +65,18 @@
                     <div class="action-multicheck-wrap"
                          ng-class="{'_active':isNewExtensionsMenuVisible}"
                          click-out="hideNewExtensionsMenu()"
-                        >
+                    >
                         <input type="checkbox"
                                style="visibility: hidden;"
                                class="admin__control-checkbox"
                                ng-class="{'_indeterminate':someExtensionsSelected}"
                                ng-checked="allExtensionsSelected"
-                            >
+                        >
                         <label></label>
                         <button class="action-multicheck-toggle"
                                 ng-class="{'_active':isNewExtensionsMenuVisible}"
                                 ng-click="toggleNewExtensionsMenu()"
-                            >
+                        >
                             <span>Options</span>
                         </button>
                         <ul class="action-menu">
@@ -134,7 +134,11 @@
                     <span class="data-grid-data">{{extension.metapackage}}</span>
                 </td>
                 <td>
-                    <span class="data-grid-data">{{extension.version}}</span>
+                    <span class="data-grid-data">
+                        <select id="selectedVersion" ng-model="extension.version">
+                            <option ng-repeat="version in extension.versions" value="{{version}}">{{version}}</option>
+                        </select>
+                    </span>
                 </td>
                 <td>
                     <span class="data-grid-data">{{extension.type}}</span>