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

Merge and add tag descriptions for the latest image

Browse source
This commit is contained in:
Joseph Schorr 2013-09-26 18:10:09 -04:00
commit 2e476625de
4 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/model.py
View file

@ -144,9 +144,14 @@ def list_repository_tags(namespace_name, repository_name):
def get_tag_image(namespace_name, repository_name, tag_name): def get_tag_image(namespace_name, repository_name, tag_name):
joined = Image.select().join(RepositoryTag).join(Repository) joined = Image.select().join(RepositoryTag).join(Repository)
return joined.where(Repository.name == repository_name, fetched = list(joined.where(Repository.name == repository_name,
Repository.namespace == namespace_name, Repository.namespace == namespace_name,
RepositoryTag.name == tag_name).execute()[0] RepositoryTag.name == tag_name))
if not fetched:
raise Image.DoesNotExist('Unable to find image for tag.')
return fetched[0]
def create_or_update_tag(namespace_name, repository_name, tag_name, def create_or_update_tag(namespace_name, repository_name, tag_name,

6
endpoints/api.py
View file

@ -85,15 +85,15 @@ def get_repo_api(namespace, repository):
} }
def repo_view(repository, tags = []): def repo_view(repository, tags = []):
tag_list = [] tag_dict = {}
for tag in tags: for tag in tags:
tag_list.append(tag_view(tag)) tag_dict[tag.name] = tag_view(tag)
return { return {
'namespace': repository.namespace, 'namespace': repository.namespace,
'name': repository.name, 'name': repository.name,
'description': repository.description, 'description': repository.description,
'tags': tag_list, 'tags': tag_dict,
'can_write': ModifyRepositoryPermission(repository.namespace, repository.name).can() 'can_write': ModifyRepositoryPermission(repository.namespace, repository.name).can()
} }

18
static/css/quay.css
View file

@ -37,4 +37,20 @@ p.editable:hover .glyphicon {
width: 100%; width: 100%;
height: 150px; height: 150px;
border: 0px; border: 0px;
} }
.repo .header {
margin-bottom: 10px;
}
.repo .description {
margin-bottom: 40px;
}
.repo dl.dl-horizontal dt {
width: 60px;
}
.repo dl.dl-horizontal dd {
margin-left: 80px;
}

20
static/partials/view-repo.html
View file

@ -2,7 +2,7 @@
No repository found No repository found
</div> </div>
<div class="container" ng-show="repo"> <div class="container repo" ng-show="repo">
<!-- Repo Header --> <!-- Repo Header -->
<div class="header"> <div class="header">
<h3> <h3>
@ -11,7 +11,7 @@
</div> </div>
<!-- Description --> <!-- Description -->
<p ng-class="'lead ' + (repo.can_write ? 'editable' : 'noteditable')" ng-click="editDescription()"><span class="content">{{repo.description}}</span><span class="glyphicon glyphicon-pencil"></span></p> <p ng-class="'description lead ' + (repo.can_write ? 'editable' : 'noteditable')" ng-click="editDescription()"><span class="content">{{repo.description}}</span><span class="glyphicon glyphicon-pencil"></span></p>
<!-- Tab bar --> <!-- Tab bar -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
@ -31,9 +31,21 @@
<li><a href="javascript:void(0)">Image History</a></li> <li><a href="javascript:void(0)">Image History</a></li>
</ul> </ul>
Loading...
<div id="current-image"> <div id="current-image">
<dl class="dl-horizontal">
<dt>Created</dt>
<dd>{{ currentTag.image.created }}</dd>
<dt>ID</dt>
<dd>{{ currentTag.image.id }}</dd>
</dl>
<div ng-show="currentTag.image.comment">
<strong>Description:</strong>
<blockquote style="margin-top: 10px;">
{{ currentTag.image.comment || '' }}
</blockquote>
</div>
</div> </div>
<!-- Modal edit for the description --> <!-- Modal edit for the description -->