vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Adding in UI for cancel anytime.

Browse source
This commit is contained in:
Charlton Austin 2016-11-16 13:51:07 -05:00
parent f6fe9023a4
commit 2fe74e4057
11 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/directives/ui/build-mini-status.js
View file

@ -12,10 +12,10 @@ angular.module('quay').directive('buildMiniStatus', function () {
'build': '=build',
'isAdmin': '=isAdmin'
},
controller: function($scope, $element) {
controller: function($scope, $element, BuildService) {
$scope.isBuilding = function(build) {
if (!build) { return true; }
return build.phase != 'complete' && build.phase != 'error';
return BuildService.isActive(build)
};
}
};

8
static/js/services/build-service.js
View file

@ -2,9 +2,9 @@
* Service which provides helper methods for reasoning about builds.
*/
angular.module('quay').factory('BuildService', [function() {
var buildService = {}
var buildService = {};
buildService.isActive = function(build) {
return build.phase != 'complete' && build.phase != 'error' && build.phase != 'expired';
return build.phase != 'complete' && build.phase != 'error' && build.phase != 'expired' && build.phase != 'cancelled';
};
buildService.getBuildMessage = function(phase) {
@ -51,6 +51,10 @@ angular.module('quay').factory('BuildService', [function() {
case 'internalerror':
return 'An internal system error occurred while building; the build will be retried in the next few minutes.';
case 'cancelled':
return 'This build was previously cancelled.';
}
};