github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(templates): show correct icon for tempate [EE-5426] (#9202) 

* show correct os icon for swarm stacks

* add compose edge stack doc comment
pull/9204/head
Matt Hook 2023-07-13 14:22:53 +12:00 committed by GitHub
parent 2d94f020d0
commit 91cfd2d0f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/portainer.go
View File

@ -1120,7 +1120,7 @@ type (
// Mandatory container/stack fields // Mandatory container/stack fields
// Template Identifier // Template Identifier
ID TemplateID `json:"Id" example:"1"` ID TemplateID `json:"Id" example:"1"`
// Template type. Valid values are: 1 (container), 2 (Swarm stack) or 3 (Compose stack) // Template type. Valid values are: 1 (container), 2 (Swarm stack), 3 (Compose stack), 4 (Compose edge stack)
Type TemplateType `json:"type" example:"1"` Type TemplateType `json:"type" example:"1"`
// Title of the template // Title of the template
Title string `json:"title" example:"Nginx"` Title string `json:"title" example:"Nginx"`

5
app/portainer/components/template-list/template-item/templateItem.html
View File

@ -14,7 +14,6 @@
{{ $ctrl.model.Title }} {{ $ctrl.model.Title }}
</span> </span>
<div class="space-left blocklist-item-subtitle inline-flex items-center"> <div class="space-left blocklist-item-subtitle inline-flex items-center">
<div ng-if="$ctrl.model.Type != 3" class="vertical-center">
<pr-icon ng-if="$ctrl.model.Platform === 1 || $ctrl.model.Platform === 'linux' || !$ctrl.model.Platform" icon="'svg-linux'" class="mr-1"></pr-icon> <pr-icon ng-if="$ctrl.model.Platform === 1 || $ctrl.model.Platform === 'linux' || !$ctrl.model.Platform" icon="'svg-linux'" class="mr-1"></pr-icon>
<span ng-if="!$ctrl.model.Platform"> &amp; </span> <span ng-if="!$ctrl.model.Platform"> &amp; </span>
<pr-icon <pr-icon
@ -23,10 +22,6 @@
class-name="'[&>*]:flex [&>*]:items-center'" class-name="'[&>*]:flex [&>*]:items-center'"
size="'lg'" size="'lg'"
></pr-icon> ></pr-icon>
</div>
<div ng-if="$ctrl.model.Type === 3" class="vertical-center">
<pr-icon icon="'svg-kubernetes'" size="'lg'" class="align-bottom" class-name="'[&>*]:flex [&>*]:items-center'"></pr-icon>
</div>
{{ $ctrl.typeLabel }} {{ $ctrl.typeLabel }}
</div> </div>
</div> </div>