Merge pull request #3312 from quay/fix-repo-panel-tags

Fix the image track offsets in the repo tags UI
This commit is contained in:
Joseph Schorr 2018-12-12 12:12:59 -05:00 committed by GitHub
commit 6cc7102ec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -298,7 +298,7 @@
<!-- Expanded View --> <!-- Expanded View -->
<tr ng-if="expandedView" class="expanded-viewport" ng-class="{'manifest-list': tag.is_manifest_list}"> <tr ng-if="expandedView" class="expanded-viewport" ng-class="{'manifest-list': tag.is_manifest_list}">
<td class="checkbox-col"></td> <td class="checkbox-col"></td>
<td class="labels-col" colspan="{{6 + (repository.trust_enabled ? 1 : 0) + (Features.SECURITY_SCANNER ? 1 : -1) }}"> <td class="labels-col" colspan="{{5 + (repository.trust_enabled ? 1 : 0) + (Features.SECURITY_SCANNER ? 1 : 0) }}">
<!-- Image ID --> <!-- Image ID -->
<div class="image-id-row"> <div class="image-id-row">
<manifest-link repository="repository" image-id="tag.image_id" manifest-digest="tag.manifest_digest"></manifest-link> <manifest-link repository="repository" image-id="tag.image_id" manifest-digest="tag.manifest_digest"></manifest-link>

View file

@ -20,7 +20,9 @@ angular.module('quay').directive('repoPanelTags', function () {
'getImages': '&getImages' 'getImages': '&getImages'
}, },
controller: function($scope, $element, $filter, $location, ApiService, UIService, VulnerabilityService, TableService) { controller: function($scope, $element, $filter, $location, ApiService, UIService, VulnerabilityService, TableService, Features) {
$scope.Features = Features;
$scope.maxTrackCount = 5; $scope.maxTrackCount = 5;
$scope.checkedTags = UIService.createCheckStateController([], 'name'); $scope.checkedTags = UIService.createCheckStateController([], 'name');