apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of properties related to backup size (#8845)

Browse Source
This commit is contained in:
Bernardo De Marco Gonçalves 2024-04-16 11:58:36 -03:00 committed by GitHub
parent 075b413041
commit 7721133ea9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/components/view/DetailsTab.vue
View File

@ -46,6 +46,15 @@
{{ service.name }} : {{ service.provider[0].name }} {{ service.name }} : {{ service.provider[0].name }}
</div> </div>
</div> </div>
<div v-else-if="$route.meta.name === 'backup' && (item === 'size' || item === 'virtualsize')">
{{ $bytesToHumanReadableSize(dataResource[item]) }}
<a-tooltip placement="right">
<template #title>
{{ dataResource[item] }} bytes
</template>
<QuestionCircleOutlined />
</a-tooltip>
</div>
<div v-else-if="$route.meta.name === 'backup' && item === 'volumes'"> <div v-else-if="$route.meta.name === 'backup' && item === 'volumes'">
<div v-for="(volume, idx) in JSON.parse(dataResource[item])" :key="idx"> <div v-for="(volume, idx) in JSON.parse(dataResource[item])" :key="idx">
<router-link :to="{ path: '/volume/' + volume.uuid }">{{ volume.type }} - {{ volume.path }}</router-link> ({{ parseFloat(volume.size / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB) <router-link :to="{ path: '/volume/' + volume.uuid }">{{ volume.type }} - {{ volume.path }}</router-link> ({{ parseFloat(volume.size / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB)

12
ui/src/components/view/InfoCard.vue
View File

@ -290,10 +290,20 @@
</div> </div>
</div> </div>
<div class="resource-detail-item" v-if="resource.volumes || resource.sizegb"> <div class="resource-detail-item" v-if="resource.volumes || resource.sizegb">
<div class="resource-detail-item__label">{{ $t('label.disksize') }}</div> <div class="resource-detail-item__label" v-if="$route.meta.name === 'backup'">{{ $t('label.size') }}</div>
<div class="resource-detail-item__label" v-else>{{ $t('label.disksize') }}</div>
<div class="resource-detail-item__details"> <div class="resource-detail-item__details">
<hdd-outlined /> <hdd-outlined />
<span style="width: 100%;" v-if="$route.meta.name === 'vm' && resource.volumes">{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage</span> <span style="width: 100%;" v-if="$route.meta.name === 'vm' && resource.volumes">{{ (resource.volumes.reduce((total, item) => total += item.size, 0) / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage</span>
<span style="width: 100%;" v-else-if="$route.meta.name === 'backup'">
{{ $bytesToHumanReadableSize(resource.size) }}
<a-tooltip placement="right">
<template #title>
{{ resource.size }} bytes
</template>
<QuestionCircleOutlined />
</a-tooltip>
</span>
<span style="width: 100%;" v-else-if="resource.sizegb || resource.size">{{ resource.sizegb || (resource.size/1024.0) }}</span> <span style="width: 100%;" v-else-if="resource.sizegb || resource.size">{{ resource.sizegb || (resource.size/1024.0) }}</span>
</div> </div>
<div style="margin-left: 25px; margin-top: 5px" v-if="resource.diskkbsread && resource.diskkbswrite && resource.diskioread && resource.diskiowrite"> <div style="margin-left: 25px; margin-top: 5px" v-if="resource.diskkbsread && resource.diskkbswrite && resource.diskioread && resource.diskiowrite">