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

style(home): only display CPU/MEM for standalone endpoints

pull/2117/head
Anthony Lapenna 2018-07-31 11:58:08 +02:00
parent 5f79547138
commit 2216bd6e80
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/endpoints/endpoint_create.go
View File

@ -174,7 +174,7 @@ func (handler *Handler) createAzureEndpoint(payload *endpointCreatePayload) (*po
endpoint := &portainer.Endpoint{
ID: portainer.EndpointID(endpointID),
Name: payload.Name,
URL: payload.URL,
URL: "https://management.azure.com",
Type: portainer.AzureEnvironment,
GroupID: portainer.EndpointGroupID(payload.GroupID),
PublicURL: payload.PublicURL,

8
app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
View File

@ -58,8 +58,12 @@
<div class="blocklist-item-line endpoint-item">
<span class="small text-muted">
<span class="small text-muted"><i class="fa fa-microchip"></i> {{ $ctrl.model.Snapshots[0].TotalCPU }}<i class="fa fa-memory space-left"></i> {{ $ctrl.model.Snapshots[0].TotalMemory | humansize }}</span>
<span class="space-left space-right">-</span>
<span ng-if="$ctrl.model.Type === 1 && !$ctrl.model.Snapshots[0].Swarm">
<span class="small text-muted">
<i class="fa fa-microchip"></i> {{ $ctrl.model.Snapshots[0].TotalCPU }}<i class="fa fa-memory space-left"></i> {{ $ctrl.model.Snapshots[0].TotalMemory | humansize }}
</span>
<span class="space-left space-right">-</span>
</span>
<span ng-if="$ctrl.model.Tags.length === 0">
<i class="fa fa-tags" aria-hidden="true"></i> No tags
</span>