diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index f1efcaef281e..0272df028a35 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -622,7 +622,7 @@
{{ $t('label.storagepool') }}
- {{ resource.storage || resource.storageid }} + {{ resource.storage || resource.storageid }} {{ resource.storage || resource.storageid }} {{ resource.storagetype }} diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue index 0109784047a5..a02fb5569ed7 100644 --- a/ui/src/components/view/ListView.vue +++ b/ui/src/components/view/ListView.vue @@ -94,7 +94,7 @@ {{ $t(text.toLowerCase()) }} - {{ text }} + {{ text }} {{ text }}   @@ -306,7 +306,7 @@ {{ text }} diff --git a/ui/src/components/widgets/Breadcrumb.vue b/ui/src/components/widgets/Breadcrumb.vue index 147e779502bf..4723417f5398 100644 --- a/ui/src/components/widgets/Breadcrumb.vue +++ b/ui/src/components/widgets/Breadcrumb.vue @@ -100,7 +100,7 @@ export default { this.breadList = [] this.$route.matched.forEach((item, idx) => { const parent = this.$route.matched[idx - 1] - if (item && parent && parent.name !== 'index' && !item.path.endsWith(':id')) { + if (item && parent && parent.name !== 'index' && !item.path.endsWith(':id') && !item.path.endsWith(':id(.*)')) { this.breadList.pop() } this.breadList.push(item) diff --git a/ui/src/config/router.js b/ui/src/config/router.js index aa85f452b734..f8ff3e001385 100644 --- a/ui/src/config/router.js +++ b/ui/src/config/router.js @@ -90,7 +90,7 @@ function generateRouterMap (section) { hideChildrenInMenu: true, children: [ { - path: '/' + child.name + '/:id', + path: '/' + child.name + '/:id(.*)', hidden: child.hidden, meta: { title: child.title, @@ -145,7 +145,7 @@ function generateRouterMap (section) { map.meta.tabs = section.tabs map.children = [{ - path: '/' + section.name + '/:id', + path: '/' + section.name + '/:id(.*)', actions: section.actions ? section.actions : [], meta: { title: section.title, diff --git a/ui/src/views/image/IsoZones.vue b/ui/src/views/image/IsoZones.vue index 75eac8fd97f5..f14ec92b3f66 100644 --- a/ui/src/views/image/IsoZones.vue +++ b/ui/src/views/image/IsoZones.vue @@ -90,7 +90,7 @@ :rowKey="record => record.zoneid">