diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js index e1c7c0a12533651acbcce97cf70085411dfdff21..ffa7af081faa3109ff6af8a20b7dc7b945e49a28 100644 --- a/setup/pub/magento/setup/install.js +++ b/setup/pub/magento/setup/install.js @@ -86,6 +86,9 @@ angular.module('install', ['ngStorage']) $scope.isSampleDataError = true; } } + }, function (response) { + $scope.displayFailure(); + $scope.log = $scope.log + response.statusText + '<br>'; }); progress.get(function () { $scope.checkProgress(); @@ -99,6 +102,7 @@ angular.module('install', ['ngStorage']) $scope.displayFailure = function () { $scope.isFailed = true; $scope.isDisabled = false; + $scope.isInProgress = false; $rootScope.isMenuEnabled = true; }; }]) @@ -107,8 +111,8 @@ angular.module('install', ['ngStorage']) get: function (callback) { $http.post('index.php/install/progress').then(callback); }, - post: function (data, callback) { - $http.post('index.php/install/start', data).success(callback); + post: function (data, success, failure) { + $http.post('index.php/install/start', data).then(success, failure); } }; }]);