Skip to content

Commit 5490b44

Browse files
committed
remove unnecessary method for os name change
1 parent bf14d20 commit 5490b44

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<resource-icon :image="resourceIcon" size="4x" style="margin-right: 5px"/>
3636
</span>
3737
<span v-else>
38-
<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" @update-osname="setResourceOsType"/>
38+
<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" />
3939
<render-icon v-else-if="typeof $route.meta.icon ==='string'" style="font-size: 36px" :icon="$route.meta.icon" />
4040
<font-awesome-icon
4141
v-else-if="$route.meta.icon && Array.isArray($route.meta.icon)"
@@ -153,18 +153,18 @@
153153
<span style="margin-left: 10px;"><copy-label :label="resource.id" /></span>
154154
</div>
155155
</div>
156-
<div class="resource-detail-item" v-if="resource.ostypename && resource.ostypeid">
156+
<div class="resource-detail-item" v-if="(resource.ostypename || resource.osdisplayname) && resource.ostypeid">
157157
<div class="resource-detail-item__label">{{ $t('label.ostypename') }}</div>
158158
<div class="resource-detail-item__details">
159159
<span v-if="images.guestoscategory">
160160
<resource-icon :image="images.guestoscategory" size="1x" style="margin-right: 5px"/>
161161
</span>
162-
<os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename" size="lg" style="margin-left: -1px" />
162+
<os-logo v-else :osId="resource.ostypeid" :osName="resource.ostypename || resource.osdisplayname" size="lg" style="margin-left: -1px" />
163163
<span style="margin-left: 8px">
164164
<router-link v-if="$router.resolve('/guestos/' + resource.ostypeid).matched[0].redirect !== '/exception/404'" :to="{ path: '/guestos/' + resource.ostypeid }">
165-
{{ resource.ostypename }}
165+
{{ resource.ostypename || resource.osdisplayname }}
166166
</router-link>
167-
<span v-else>{{ resource.ostypename }}</span>
167+
<span v-else>{{ resource.ostypename || resource.osdisplayname }}</span>
168168
</span>
169169
</div>
170170
</div>
@@ -1252,10 +1252,6 @@ export default {
12521252
this.getTags()
12531253
})
12541254
},
1255-
setResourceOsType (name) {
1256-
this.newResource.ostypename = name
1257-
this.$emit('change-resource', this.newResource)
1258-
},
12591255
getRouterQuery (item) {
12601256
const query = {}
12611257
if (item.value) {

0 commit comments

Comments
 (0)