Merge pull request #3275 from kleesc/fix-tag-ui-function-name

Fix tag ui function name
This commit is contained in:
Kenny Lee Sin Cheong 2018-10-30 14:07:55 -04:00 committed by GitHub
commit 436e8cb760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View file

@ -341,7 +341,8 @@
<div class="empty-secondary-msg">Try expanding your filtering terms.</div> <div class="empty-secondary-msg">Try expanding your filtering terms.</div>
</div> </div>
<div class="empty" ng-if="!allTags.length"> <div class="cor-loader" ng-show="tagsLoading"></div>
<div class="empty" ng-if="!allTags.length && !tagsLoading">
<div class="empty-primary-msg">This repository is empty.</div> <div class="empty-primary-msg">This repository is empty.</div>
<div class="empty-secondary-msg">Push a tag or initiate a build to populate this repository.</div> <div class="empty-secondary-msg">Push a tag or initiate a build to populate this repository.</div>
</div> </div>

View file

@ -39,7 +39,7 @@ angular.module('quay').directive('tagOperationsDialog', function () {
$.extend(tags, newTags); $.extend(tags, newTags);
if (resp.has_additional) { if (resp.has_additional) {
loadPaginatedRepositoryTags(page + 1, tags, added, removed); reloadTags(page + 1, tags, added, removed);
} else { } else {
$scope.repositoryTags = tags; $scope.repositoryTags = tags;
$scope.imageLoader.reset(); $scope.imageLoader.reset();

View file

@ -31,7 +31,8 @@
'imageLoader': imageLoader, 'imageLoader': imageLoader,
'builds': null, 'builds': null,
'historyFilter': '', 'historyFilter': '',
'repositoryTags': null 'repositoryTags': null,
'tagsLoading': true
}; };
$scope.repositoryTags = {}; $scope.repositoryTags = {};
@ -77,7 +78,9 @@
if (resp.has_additional) { if (resp.has_additional) {
loadPaginatedRepositoryTags(page + 1); loadPaginatedRepositoryTags(page + 1);
} } else {
$scope.viewScope.tagsLoading = false;
}
}); });
}; };

View file

@ -77,6 +77,7 @@
<div class="repo-panel-tags" <div class="repo-panel-tags"
repository="viewScope.repository" repository="viewScope.repository"
repository-tags="viewScope.repositoryTags" repository-tags="viewScope.repositoryTags"
tags-loading="viewScope.tagsLoading"
image-loader="viewScope.imageLoader" image-loader="viewScope.imageLoader"
selected-tags="viewScope.selectedTags" selected-tags="viewScope.selectedTags"
history-filter="viewScope.historyFilter" history-filter="viewScope.historyFilter"