mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
UI: Fix OS Type displayed for a VM (#11075)
* UI: Fix OS Type displayed * remove unnecessary method for os name change --------- Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
This commit is contained in:
parent
1fbe1d7682
commit
071e612f40
@ -35,7 +35,7 @@
|
||||
<resource-icon :image="resourceIcon" size="4x" style="margin-right: 5px"/>
|
||||
</span>
|
||||
<span v-else>
|
||||
<os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.name" size="3x" @update-osname="setResourceOsType"/>
|
||||
<os-logo v-if="resource.ostypeid || resource.ostypename || ['guestoscategory'].includes($route.path.split('/')[1])" :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname || resource.name" size="3x" />
|
||||
<render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
|
||||
<font-awesome-icon
|
||||
v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)"
|
||||
@ -153,18 +153,18 @@
|
||||
<span style="margin-left: 10px;"><copy-label :label="resource.id" /></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="resource-detail-item" v-if="resource.ostypename && resource.ostypeid">
|
||||
<div class="resource-detail-item" v-if="(resource.ostypename || resource.osdisplayname) && resource.ostypeid">
|
||||
<div class="resource-detail-item__label">{{ $t('label.ostypename') }}</div>
|
||||
<div class="resource-detail-item__details">
|
||||
<span v-if="images.guestoscategory">
|
||||
<resource-icon :image="images.guestoscategory" size="1x" style="margin-right: 5px"/>
|
||||
</span>
|
||||
<os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename" size="lg" style="margin-left: -1px" />
|
||||
<os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname" size="lg" style="margin-left: -1px" />
|
||||
<span style="margin-left: 8px">
|
||||
<router-link v-if="$router.resolve('/guestos/' + resource.ostypeid).matched[0].redirect !== '/exception/404'" :to="{ path: '/guestos/' + resource.ostypeid }">
|
||||
{{ resource.ostypename }}
|
||||
{{ resource.ostypename || resource.osdisplayname }}
|
||||
</router-link>
|
||||
<span v-else>{{ resource.ostypename }}</span>
|
||||
<span v-else>{{ resource.ostypename || resource.osdisplayname }}</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -1252,10 +1252,6 @@ export default {
|
||||
this.getTags()
|
||||
})
|
||||
},
|
||||
setResourceOsType (name) {
|
||||
this.newResource.ostypename = name
|
||||
this.$emit('change-resource', this.newResource)
|
||||
},
|
||||
getRouterQuery (item) {
|
||||
const query = {}
|
||||
if (item.value) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user