Skip to content
Snippets Groups Projects
Commit dc85aed4 authored by Andrii Lugovyi's avatar Andrii Lugovyi
Browse files

MAGETWO-54692: Merchant can't install 2.1.0 EE with sample data using CLI (74% issue)

parent cdf09964
No related merge requests found
......@@ -12,6 +12,7 @@ angular.module('install', ['ngStorage'])
$scope.isDisabled = false;
$scope.isSampleDataError = false;
$scope.isShowCleanUpBox = false;
$scope.log = '';
$scope.toggleConsole = function () {
$scope.isConsole = $scope.isConsole === false;
};
......@@ -29,7 +30,9 @@ angular.module('install', ['ngStorage'])
response.data.console.forEach(function (message) {
log = log + message + '<br>';
});
$scope.log = $sce.trustAsHtml(log);
if ($scope.isFailed === false) {
$scope.log = $sce.trustAsHtml($scope.log.toString() + log);
}
if (response.data.success) {
$scope.progress = response.data.progress;
......@@ -88,7 +91,7 @@ angular.module('install', ['ngStorage'])
}
}, function (response) {
$scope.displayFailure();
$scope.log = $scope.log + response.statusText + '<br>';
$scope.log = $sce.trustAsHtml($scope.log.toString() + '[Error] ' + response.statusText);
});
progress.get(function () {
$scope.checkProgress();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment