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

almost all PR discussion fixes

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-04-21 18:04:25 -04:00
parent d25cc4db9c
commit 02498d72ba
13 changed files with 200 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/js/directives/repo-view/repo-panel-builds.js
View file

@ -170,8 +170,6 @@ angular.module('quay').directive('repoPanelBuilds', function () {
$scope.showTriggerCredentialsModal = function(trigger) {
$scope.triggerCredentialsModalTrigger = trigger;
$scope.triggerCredentialsModalCounter++;
console.log($scope.triggerCredentialsModalTrigger)
console.log($scope.triggerCredentialsModalCounter)
};
$scope.askDeleteTrigger = function(trigger) {

4
static/js/directives/ui/trigger-credentials-dialog.js
View file

@ -1,5 +1,5 @@
/**
* An element which displays a dialog with the public SSH keycredentials for a trigger.
* An element which displays a dialog with the necessary credentials for a build trigger.
*/
angular.module('quay').directive('triggerCredentialsDialog', function () {
var directiveDefinitionObject = {
@ -14,7 +14,7 @@ angular.module('quay').directive('triggerCredentialsDialog', function () {
},
controller: function($scope, $element) {
var show = function() {
if (!$scope.trigger) {
if (!$scope.trigger || !$scope.counter) {
$('#triggercredentialsmodal').modal('hide');
return;
}

14
static/js/services/trigger-service.js
View file

@ -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) {