[cloudstack] branch 4.17 updated: UI: display cpu cores and speed instead of cputotal by default (#7106)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.17 by this push:
     new fe0e44abe98 UI: display cpu cores and speed instead of cputotal by default (#7106)
fe0e44abe98 is described below

commit fe0e44abe98f0ff0d7adb5aca9b8e400ec1c80f8
Author: Wei Zhou <we...@apache.org>
AuthorDate: Wed Jan 18 13:55:10 2023 +0100

    UI: display cpu cores and speed instead of cputotal by default (#7106)
---
 ui/src/components/view/InfoCard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index b16beb0821c..c7c8292f34c 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -143,8 +143,8 @@
           <div class="resource-detail-item__label">{{ $t('label.cpu') }}</div>
           <div class="resource-detail-item__details">
             <appstore-outlined />
-            <span v-if="resource.cputotal">{{ resource.cputotal }}</span>
-            <span v-else>{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
+            <span v-if="'cpunumber' in resource && 'cpuspeed' in resource">{{ resource.cpunumber }} CPU x {{ parseFloat(resource.cpuspeed / 1000.0).toFixed(2) }} Ghz</span>
+            <span v-else>{{ resource.cputotal }}</span>
           </div>
           <div>
             <span v-if="resource.cpuused">