Merge branch 'master' of ssh://bitbucket.org/yackob03/quay
This commit is contained in:
commit
6af6305edd
3 changed files with 13 additions and 5 deletions
|
@ -5,7 +5,7 @@
|
||||||
ng-class="getImageListingClasses(image)">
|
ng-class="getImageListingClasses(image)">
|
||||||
<span class="image-listing-circle"></span>
|
<span class="image-listing-circle"></span>
|
||||||
<span class="image-listing-line"></span>
|
<span class="image-listing-line"></span>
|
||||||
<span class="context-tooltip image-listing-id" bs-tooltip="" data-title="getFirstTextLine(image.comment)"
|
<span class="context-tooltip image-listing-id" bs-tooltip="" data-title="{{ getFirstTextLine(image.comment) }}"
|
||||||
data-html="true">
|
data-html="true">
|
||||||
{{ image.id.substr(0, 12) }}
|
{{ image.id.substr(0, 12) }}
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -4896,7 +4896,7 @@ quayApp.directive('tagSpecificImagesView', function () {
|
||||||
}
|
}
|
||||||
|
|
||||||
var currentTag = $scope.repository.tags[$scope.tag];
|
var currentTag = $scope.repository.tags[$scope.tag];
|
||||||
if (image.dbid == currentTag.image.dbid) {
|
if (image.dbid == currentTag.dbid) {
|
||||||
classes += 'tag-image ';
|
classes += 'tag-image ';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4906,8 +4906,6 @@ quayApp.directive('tagSpecificImagesView', function () {
|
||||||
var forAllTagImages = function(tag, callback) {
|
var forAllTagImages = function(tag, callback) {
|
||||||
if (!tag) { return; }
|
if (!tag) { return; }
|
||||||
|
|
||||||
callback(tag.image);
|
|
||||||
|
|
||||||
if (!$scope.imageByDBID) {
|
if (!$scope.imageByDBID) {
|
||||||
$scope.imageByDBID = [];
|
$scope.imageByDBID = [];
|
||||||
for (var i = 0; i < $scope.images.length; ++i) {
|
for (var i = 0; i < $scope.images.length; ++i) {
|
||||||
|
@ -4916,7 +4914,14 @@ quayApp.directive('tagSpecificImagesView', function () {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var ancestors = tag.image.ancestors.split('/');
|
var tag_image = $scope.imageByDBID[tag.dbid];
|
||||||
|
if (!tag_image) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
callback(tag_image);
|
||||||
|
|
||||||
|
var ancestors = tag_image.ancestors.split('/');
|
||||||
for (var i = 0; i < ancestors.length; ++i) {
|
for (var i = 0; i < ancestors.length; ++i) {
|
||||||
var image = $scope.imageByDBID[ancestors[i]];
|
var image = $scope.imageByDBID[ancestors[i]];
|
||||||
if (image) {
|
if (image) {
|
||||||
|
|
|
@ -450,6 +450,8 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.loadImageChanges = function(image) {
|
$scope.loadImageChanges = function(image) {
|
||||||
|
if (!image) { return; }
|
||||||
|
|
||||||
var params = {'repository': namespace + '/' + name, 'image_id': image.id};
|
var params = {'repository': namespace + '/' + name, 'image_id': image.id};
|
||||||
$scope.currentImageChangeResource = ApiService.getImageChangesAsResource(params).get(function(ci) {
|
$scope.currentImageChangeResource = ApiService.getImageChangesAsResource(params).get(function(ci) {
|
||||||
$scope.currentImageChanges = ci;
|
$scope.currentImageChanges = ci;
|
||||||
|
@ -697,6 +699,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi
|
||||||
callback(tag_image);
|
callback(tag_image);
|
||||||
|
|
||||||
// Callback any parent images.
|
// Callback any parent images.
|
||||||
|
if (!tag_image.ancestors) { return; }
|
||||||
var ancestors = tag_image.ancestors.split('/');
|
var ancestors = tag_image.ancestors.split('/');
|
||||||
for (var i = 0; i < ancestors.length; ++i) {
|
for (var i = 0; i < ancestors.length; ++i) {
|
||||||
var image = $scope.imageByDBID[ancestors[i]];
|
var image = $scope.imageByDBID[ancestors[i]];
|
||||||
|
|
Reference in a new issue