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

Merge pull request #1298 from coreos-inc/secscanimageview

Browse source 
Fix display of images in new sec scan API
This commit is contained in:
josephschorr 2016-03-17 18:28:08 -04:00
commit e3fb249b8e
4 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
static/directives/image-feature-view.html
View file

@ -146,10 +146,15 @@
</span> </span>
</td> </td>
<td class="double-col image-col hidden-xs hidden-sm hidden-md"> <td class="double-col image-col hidden-xs hidden-sm hidden-md">
<span data-title="{{ feature.imageCommand }}" bs-tooltip> <span bo-if="feature.imageCommand">
<span class="dockerfile-command" command="feature.imageCommand"></span> <span data-title="{{ feature.imageCommand }}" data-container="body" bs-tooltip>
<span class="dockerfile-command" command="feature.imageCommand"></span>
</span>
<a href="/repository/{{ repository.namespace }}/{{ repository.name }}/image/{{ feature.imageId }}"><i class="fa fa-archive"></i></a>
</span>
<span bo-if="!feature.imageCommand">
<span class="image-link" repository="repository" image-id="feature.imageId"></span>
</span> </span>
<a href="/repository/{{ repository.namespace }}/{{ repository.name }}/image/{{ feature.imageId }}"><i class="fa fa-archive"></i></a>
</td> </td>
<td></td> <td></td>
</tr> </tr>

5
static/directives/image-view-layer.html
View file

@ -4,9 +4,8 @@
{{ image.id.substr(0, 12) }} {{ image.id.substr(0, 12) }}
</a> </a>
</div> </div>
<div class="image-comment" ng-if="image.comment">{{ image.comment }}</div> <div class="image-command">
<div class="image-command"> <div class="nondocker-command" ng-if="!getDockerfileCommand(image.command)">{{ image.command.join(' ') }}</div>
<div class="nondocker-command" ng-if="!getDockerfileCommand(image.command) && image.command.length">{{ image.command.join(' ') }}</div>
<div class="dockerfile-command" command="getDockerfileCommand(image.command)" <div class="dockerfile-command" command="getDockerfileCommand(image.command)"
ng-if="getDockerfileCommand(image.command)"></div> ng-if="getDockerfileCommand(image.command)"></div>
</div> </div>

11
static/directives/image-vulnerability-view.html
View file

@ -134,10 +134,15 @@
<span class="fixed-in-version" bo-if="vuln.fixedInVersion" bo-text="vuln.fixedInVersion"></span> <span class="fixed-in-version" bo-if="vuln.fixedInVersion" bo-text="vuln.fixedInVersion"></span>
</td> </td>
<td class="double-col image-col hidden-xs hidden-sm hidden-md"> <td class="double-col image-col hidden-xs hidden-sm hidden-md">
<span data-title="{{ vuln.imageCommand }}" data-container="body" bs-tooltip> <span bo-if="vuln.imageCommand">
<span class="dockerfile-command" command="vuln.imageCommand"></span> <span data-title="{{ vuln.imageCommand }}" data-container="body" bs-tooltip>
<span class="dockerfile-command" command="vuln.imageCommand"></span>
</span>
<a href="/repository/{{ repository.namespace }}/{{ repository.name }}/image/{{ vuln.imageId }}"><i class="fa fa-archive"></i></a>
</span>
<span bo-if="!vuln.imageCommand">
<span class="image-link" repository="repository" image-id="vuln.imageId"></span>
</span> </span>
<a href="/repository/{{ repository.namespace }}/{{ repository.name }}/image/{{ vuln.imageId }}"><i class="fa fa-archive"></i></a>
</td> </td>
<td></td> <td></td>
</tr> </tr>

2
static/js/services/image-metadata-service.js
View file

@ -31,6 +31,8 @@ angular.module('quay').factory('ImageMetadataService', ['UtilService', function(
if (!image.__imageMap) { if (!image.__imageMap) {
image.__imageMap = {}; image.__imageMap = {};
image.__imageMap[image.id] = image;
for (var i = 0; i < image.history.length; ++i) { for (var i = 0; i < image.history.length; ++i) {
var cimage = image.history[i]; var cimage = image.history[i];
image.__imageMap[cimage.id] = cimage; image.__imageMap[cimage.id] = cimage;