Fix small UI bugs around uploading dockerfiles
Fixes #606 - Raises an error when a non-200 code is returned - Resets the dialog when reopened - Has a nicer error message for 413 errors
This commit is contained in:
parent
2f42a4d94d
commit
328aacbc60
2 changed files with 21 additions and 5 deletions
|
@ -52,6 +52,7 @@ angular.module('quay').directive('dockerfileBuildDialog', function () {
|
||||||
if (sn && $scope.repository) {
|
if (sn && $scope.repository) {
|
||||||
$scope.viewTriggers = false;
|
$scope.viewTriggers = false;
|
||||||
$scope.startTrigger = null;
|
$scope.startTrigger = null;
|
||||||
|
$scope.errorMessage = null;
|
||||||
|
|
||||||
$element.find('.dockerfilebuildModal').modal({});
|
$element.find('.dockerfilebuildModal').modal({});
|
||||||
|
|
||||||
|
|
|
@ -196,21 +196,36 @@ angular.module('quay').directive('dockerfileBuildForm', function () {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
request.onerror = function() {
|
request.onerror = function() {
|
||||||
$scope.$apply(function() {
|
$scope.$apply(function() {
|
||||||
handleUploadFailed();
|
handleUploadFailed();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
request.onreadystatechange = function() {
|
request.onreadystatechange = function() {
|
||||||
var state = request.readyState;
|
var state = request.readyState;
|
||||||
|
var status = request.status;
|
||||||
|
|
||||||
if (state == 4) {
|
if (state == 4) {
|
||||||
$scope.$apply(function() {
|
if (Math.floor(status / 100) == 2) {
|
||||||
startBuild(fileId);
|
$scope.$apply(function() {
|
||||||
$scope.uploading = false;
|
startBuild(fileId);
|
||||||
});
|
$scope.uploading = false;
|
||||||
return;
|
});
|
||||||
|
} else {
|
||||||
|
var message = request.statusText;
|
||||||
|
if (status == 413) {
|
||||||
|
message = 'Selected file too large to upload';
|
||||||
|
}
|
||||||
|
|
||||||
|
$scope.$apply(function() {
|
||||||
|
handleUploadFailed(message);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
request.send(file);
|
request.send(file);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in a new issue