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

UI: Fix duplicate memory values on InfoCard view conditions (#11896)

Browse Source
This commit is contained in:
Nicolas Vazquez 2025-10-23 02:00:17 -03:00 committed by GitHub
parent 8bbe253b00
commit 2fcf96267d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,26 +259,6 @@
</span> </span>
</div> </div>
</div> </div>
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
<div class="resource-detail-item__details">
<font-awesome-icon
:icon="['fa-solid', 'fa-microchip']"
class="anticon"
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
<span>
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
<span v-else>{{ resource.gpucardname }}</span>
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
</span>
</span>
</div>
</div>
<div class="resource-detail-item" v-else-if="resource.memorytotalgb"> <div class="resource-detail-item" v-else-if="resource.memorytotalgb">
<div class="resource-detail-item__label">{{ $t('label.memory') }}</div> <div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
<div class="resource-detail-item__details"> <div class="resource-detail-item__details">
@ -344,6 +324,26 @@
</div> </div>
</div> </div>
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
<div class="resource-detail-item__details">
<font-awesome-icon
:icon="['fa-solid', 'fa-microchip']"
class="anticon"
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
<span>
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
<span v-else>{{ resource.gpucardname }}</span>
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
</span>
</span>
</div>
</div>
<div class="resource-detail-item" v-if="resource.gputotal"> <div class="resource-detail-item" v-if="resource.gputotal">
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div> <div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
<div class="resource-detail-item__details"> <div class="resource-detail-item__details">