From cdf09964fbd18e4d659b44fc4b3fca648db25a49 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@magento.com>
Date: Tue, 5 Jul 2016 15:53:35 +0300
Subject: [PATCH] MAGETWO-54692: Merchant can't install 2.1.0 EE with sample
data using CLI (74% issue)
---
setup/pub/magento/setup/install.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index e1c7c0a1253..ffa7af081fa 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);
}
};
}]);
--
GitLab