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

Merge pull request #148 from coreos-inc/squashwarn

Browse source 
Add better messaging around squashed fetching when the user is not a namespace admin
This commit is contained in:
Jimmy Zelinskie 2015-06-17 16:40:20 -04:00
commit 4fb1875dbe
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
static/directives/fetch-tag-dialog.html
View file

@ -42,7 +42,15 @@
allowed-entities="['robot']"
clear-value="clearCounter"
auto-clear="false"
current-entity="currentEntity"></div>
current-entity="currentEntity"
ng-show="currentFormat.has_creds"></div>
<div class="co-alert co-alert-warning" ng-show="!currentFormat.has_creds"
style="margin-top: 4px; margin-bottom: 0px">
Fetching a {{ currentFormat.title }} requires a robot account. You must therefore
have admin access on namespace <strong>{{ repository.namespace }}</strong> to setup
this fetch.
</div>
</td>
</tr>
</table>

5
static/js/directives/ui/fetch-tag-dialog.js
View file

@ -24,12 +24,13 @@ angular.module('quay').directive('fetchTagDialog', function () {
var updateFormats = function() {
$scope.formats = [];
if ($scope.repository && UserService.isNamespaceAdmin($scope.repository.namespace)) {
if ($scope.repository) {
$scope.formats.push({
'title': 'Squashed Docker Image',
'icon': 'ci-squashed',
'command': 'curl -L -f {http}://{pull_user}:{pull_password}@{hostname}/c1/squash/{namespace}/{name}/{tag} | docker load',
'require_creds': true
'require_creds': true,
'has_creds': UserService.isNamespaceAdmin($scope.repository.namespace)
});
}