almost all PR discussion fixes
This commit is contained in:
parent
d25cc4db9c
commit
02498d72ba
13 changed files with 200 additions and 148 deletions
|
@ -37,7 +37,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
|
|||
return authorize_url + 'client_id=' + client_id +
|
||||
'&scope=repo,user:email&redirect_uri=' + redirect_uri;
|
||||
},
|
||||
'target': '',
|
||||
'is_external': true,
|
||||
'is_enabled': function() {
|
||||
return Features.GITHUB_BUILD;
|
||||
},
|
||||
|
@ -52,7 +52,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
|
|||
}
|
||||
},
|
||||
|
||||
'custom': {
|
||||
'custom-git': {
|
||||
'description': function(config) {
|
||||
var source = UtilService.textToSafeHtml(config['build_source']);
|
||||
var desc = '<i class"fa fa-git fa-lg" style="margin-left:2px; margin-right: 2px"></i> Push to Custom Git Repository ' + source;
|
||||
|
@ -69,7 +69,7 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
|
|||
'get_redirect_url': function(namespace, repository) {
|
||||
return Config.getUrl('/customtrigger/setup/' + namespace + '/' + repository);
|
||||
},
|
||||
'target': '_self',
|
||||
'is_external': false,
|
||||
'is_enabled': function() { return true; },
|
||||
'icon': 'fa-git',
|
||||
'title': function() { return 'Custom Git Repository Push'; }
|
||||
|
@ -95,9 +95,11 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
|
|||
return type['get_redirect_url'](namespace, repository);
|
||||
};
|
||||
|
||||
// Helper to remove the prefix and suffix /s on subdir paths.
|
||||
triggerService.trimSubdir = function(subdir) {
|
||||
return subdir.replace(new RegExp('(^\/+|\/+$)'), '');
|
||||
triggerService.getDockerfileLocation = function(trigger) {
|
||||
if (!trigger.config.subdir) {
|
||||
return '//Dockerfile';
|
||||
}
|
||||
return '//' + trigger.config.subdir.replace(new RegExp('(^\/+|\/+$)'), '') + '/Dockerfile';
|
||||
};
|
||||
|
||||
triggerService.getTitle = function(name) {
|
||||
|
|
Reference in a new issue