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

Merge pull request #59 from jzelinskie/custom-git-fix

Browse source 
triggers: metadata.commit_sha -> metadata.commit
This commit is contained in:
josephschorr 2015-06-02 16:10:26 -04:00
commit 63f289a8cb
8 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/directives/triggered-build-description.html
View file

@ -21,14 +21,14 @@
<div class="tbd-content" ng-switch-when="commitsha">
Triggered by commit
<span class="source-commit-link"
commit-sha="build.trigger_metadata.commit_sha"></span>
commit-sha="TriggerService.getCommitSHA(build.trigger_metadata)"></span>
</div>
<!-- Full Commit Information -->
<div class="tbd-content" ng-switch-when="fullcommit">
<div class="commit-message">
<span class="anchor" is-only-text="!TriggerService.getFullLinkTemplate(build, 'commit')"
target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', build.trigger_metadata.commit_sha) }}">
target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', TriggerService.getCommitSHA(build.trigger_metadata)) }}">
{{ build.trigger_metadata.commit_info.message }}
</span>
</div>
@ -46,7 +46,7 @@
</span>
</span>
<span class="source-commit-link"
commit-sha="build.trigger_metadata.commit_sha"
commit-sha="TriggerService.getCommitSHA(build.trigger_metadata)"
url-template="TriggerService.getFullLinkTemplate(build, 'commit')"></span>
<span class="source-ref-link"
ref="build.trigger_metadata.ref"

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

@ -45,7 +45,7 @@ angular.module('quay').directive('repoPanelBuilds', function () {
var commit_sha = null;
if (build_info.trigger_metadata) {
commit_sha = build_info.trigger_metadata.commit_sha;
commit_sha = TriggerService.getCommitSHA(build_info.trigger_metadata);
}
return $.extend(build_info, {

4
static/js/directives/ui/triggered-build-description.js
View file

@ -33,7 +33,7 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
return;
}
if (build.trigger && build.trigger.build_source && triggerMetadata.commit_sha) {
if (build.trigger && build.trigger.build_source && TriggerService.getCommitSHA(triggerMetadata)) {
$scope.infoDisplay = 'commitsha';
return;
}
@ -43,4 +43,4 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
}
};
return directiveDefinitionObject;
});
});

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

@ -252,6 +252,10 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
return desc;
};
triggerService.getCommitSHA = function(metadata) {
return metadata.commit || metadata.commit_sha;
};
triggerService.getMetadata = function(name) {
return triggerTypes[name];
};