Merge remote-tracking branch 'mainline/develop' into develop

Author: Yaroslav Onischenko

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

@@ -141,7 +141,6 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
         $this->assertObjectHasAttribute('license', $json);
         $this->assertObjectHasAttribute('type', $json);
         $this->assertObjectHasAttribute('version', $json);
-        $this->assertVersionInSync($json->name, $json->version);
         $this->assertObjectHasAttribute('require', $json);
         $this->assertEquals($packageType, $json->type);
         if ($packageType !== 'project') {
@@ -264,22 +263,6 @@ private function assertDependsOnFramework(\StdClass $json)
         );
     }
 
-    /**
-     * Assert that versions in root composer.json and Magento component's composer.json are not out of sync
-     *
-     * @param string $name
-     * @param string $version
-     */
-    private function assertVersionInSync($name, $version)
-    {
-        $this->assertEquals(
-            self::$rootJson['version'],
-            $version,
-            "Version {$version} in component {$name} is inconsistent with version "
-            . self::$rootJson['version'] . ' in root composer.json'
-        );
-    }
-
     /**
      * Assert that PHP versions in root composer.json and Magento component's composer.json are not out of sync
      *

setup/pub/magento/setup/app.js

@@ -31,9 +31,15 @@ var app = angular.module(
         'system-config'
     ]);
 
-app.config(function ($stateProvider) {
+app.config(['$httpProvider', '$stateProvider', function ($httpProvider, $stateProvider) {
+    if (!$httpProvider.defaults.headers.get) {
+        $httpProvider.defaults.headers.get = {};
+    }
+    $httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache, no-store, must-revalidate';
+    $httpProvider.defaults.headers.get['Pragma'] = 'no-cache';
+    $httpProvider.defaults.headers.get['Expires'] = 0;
     app.stateProvider = $stateProvider;
-})
+}])
     .config(function($provide) {
         $provide.decorator('$state', function($delegate, $stateParams) {
             $delegate.forceReload = function() {

setup/pub/magento/setup/component-grid.js

@@ -117,15 +117,15 @@ angular.module('component-grid', ['ngStorage'])
                         version: $scope.availableUpdatePackages[component.name]['latestVersion']
                     }
                 ];
-                if ($localStorage.titles['update'].indexOf(component.moduleName) < 0 ) {
-                    $localStorage.titles['update'] = 'Update ' + component.moduleName;
-                }
                 if (component.moduleName) {
                     $localStorage.moduleName = component.moduleName;
                 } else {
                     $localStorage.moduleName = component.name;
                 }
-
+                if ($localStorage.titles['update'].indexOf($localStorage.moduleName) < 0 ) {
+                    $localStorage.titles['update'] = 'Update ' + $localStorage.moduleName;
+                }
+                $rootScope.titles = $localStorage.titles;
                 $scope.nextState();
             };
 
@@ -135,15 +135,16 @@ angular.module('component-grid', ['ngStorage'])
                         name: component.name
                     }
                 ];
-                if ($localStorage.titles['uninstall'].indexOf(component.moduleName) < 0 ) {
-                    $localStorage.titles['uninstall'] = 'Uninstall ' + component.moduleName;
-                }
-                $localStorage.componentType = component.type;
                 if (component.moduleName) {
                     $localStorage.moduleName = component.moduleName;
                 } else {
                     $localStorage.moduleName = component.name;
                 }
+                if ($localStorage.titles['uninstall'].indexOf($localStorage.moduleName) < 0 ) {
+                    $localStorage.titles['uninstall'] = 'Uninstall ' + $localStorage.moduleName;
+                }
+                $rootScope.titles = $localStorage.titles;
+                $localStorage.componentType = component.type;
                 $state.go('root.readiness-check-uninstall');
             };
 
@@ -154,12 +155,17 @@ angular.module('component-grid', ['ngStorage'])
                             name: component.moduleName
                         }
                     ];
-                    if ($localStorage.titles[type].indexOf(component.moduleName) < 0 ) {
+                    if (component.moduleName) {
+                        $localStorage.moduleName = component.moduleName;
+                    } else {
+                        $localStorage.moduleName = component.name;
+                    }
+                    if ($localStorage.titles[type].indexOf($localStorage.moduleName) < 0 ) {
                         $localStorage.titles[type] = type.charAt(0).toUpperCase() + type.slice(1) + ' '
-                            + component.moduleName;
+                            + $localStorage.moduleName;
                     }
+                    $rootScope.titles = $localStorage.titles;
                     $localStorage.componentType = component.type;
-                    $localStorage.moduleName = component.moduleName;
                     $state.go('root.readiness-check-'+type);
                 }
             };

setup/pub/magento/setup/main.js

@@ -113,14 +113,17 @@ main.controller('navigationController',
     return {
         mainState: {},
         states: [],
+        titlesWithModuleName: ['enable', 'disable', 'update', 'uninstall'],
         load: function () {
-            $localStorage.$reset();
             var self = this;
             return $http.get('index.php/navigation').success(function (data) {
                 var currentState = $location.path().replace('/', '');
                 var isCurrentStateFound = false;
                 self.states = data.nav;
                 $localStorage.menu = data.menu;
+                self.titlesWithModuleName.forEach(function (value) {
+                    data.titles[value] = data.titles[value] + $localStorage.moduleName;
+                });
                 $localStorage.titles = data.titles;
                 data.nav.forEach(function (item) {
                     app.stateProvider.state(item.id, item);

setup/pub/magento/setup/success.js

@@ -27,4 +27,5 @@ angular.module('success', ['ngStorage'])
         $localStorage.$reset();
         $scope.admin.password = '';
         $scope.db.password = '';
+        $localStorage.$reset();
     }]);

setup/pub/magento/setup/updater-success.js

@@ -18,4 +18,5 @@ angular.module('updater-success', ['ngStorage'])
         $scope.back = function () {
             $window.location.href = '';
         }
+        $localStorage.$reset();
     }]);