Merge branch 'master' into redalert

This commit is contained in:
Joseph Schorr 2014-07-18 15:58:56 -04:00
commit 591cd020b8
15 changed files with 153 additions and 184 deletions

View file

@ -4478,7 +4478,7 @@ quayApp.directive('dockerfileCommand', function () {
},
'': function(pieces) {
var rnamespace = pieces.length == 1 ? '_' : pieces[0];
var rnamespace = pieces.length == 1 ? '_' : 'u/' + pieces[0];
var rname = pieces[pieces.length - 1].split(':')[0];
return 'https://registry.hub.docker.com/' + rnamespace + '/' + rname + '/';
}
@ -4550,7 +4550,7 @@ quayApp.directive('dockerfileView', function () {
}
var lineInfo = {
'text': UtilService.textToSafeHtml(line),
'text': line,
'kind': kind
};
$scope.lines.push(lineInfo);
@ -5224,7 +5224,7 @@ quayApp.directive('tagSpecificImagesView', function () {
}
var currentTag = $scope.repository.tags[$scope.tag];
if (image.dbid == currentTag.image.dbid) {
if (image.dbid == currentTag.dbid) {
classes += 'tag-image ';
}
@ -5234,8 +5234,6 @@ quayApp.directive('tagSpecificImagesView', function () {
var forAllTagImages = function(tag, callback) {
if (!tag) { return; }
callback(tag.image);
if (!$scope.imageByDBID) {
$scope.imageByDBID = [];
for (var i = 0; i < $scope.images.length; ++i) {
@ -5244,7 +5242,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) {
var image = $scope.imageByDBID[ancestors[i]];
if (image) {