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

Have tag operations dialog reflect time machine configuration

Browse source 
If a tag deletion is going to remove images, but those images are not going to be removed immediately, we need to message that

Fixes https://www.pivotaltracker.com/story/show/143063199
This commit is contained in:
Joseph Schorr 2017-04-05 13:27:36 -04:00
parent 6bef1d1ff3
commit eb5cebbcdf
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
endpoints/api/repository.py
View file

@ -379,6 +379,7 @@ class Repository(RepositoryParamResource):
'is_starred': is_starred,
'status_token': repo.badge_token if not is_public else '',
'trust_enabled': bool(features.SIGNING) and repo.trust_enabled,
'tag_expiration_s': repo.namespace_user.removed_tag_expiration_s,
}
if stats is not None:

2
static/directives/tag-operations-dialog.html
View file

@ -122,7 +122,7 @@
<div class="tag-specific-images-view" tag="deleteTagInfo.tag" repository="repository"
image-loader="imageLoader" style="margin-top: 20px">
The following images and any other images not referenced by a tag will be deleted:
The following images and any other images not referenced by a tag will be <span ng-if="repository.tag_expiration_s == 0">deleted</span><span ng-if="repository.tag_expiration_s != 0">unavailable and deleted in {{ getFormattedTimespan(repository.tag_expiration_s) }}</span>:
</div>
</div>

7
static/js/directives/ui/tag-operations-dialog.js
View file

@ -153,6 +153,13 @@ angular.module('quay').directive('tagOperationsDialog', function () {
}, errorHandler);
};
$scope.getFormattedTimespan = function(seconds) {
if (!seconds) {
return null;
}
return moment.duration(seconds, "seconds").humanize();
};
$scope.editLabels = function(info, callback) {
var actions = [];
var existingMutableLabels = {};