This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new 0c47d4e ui: show domain paths for offering domain selection (#4979)
0c47d4e is described below
commit 0c47d4efd204434dbcef5e7d2b58316903865c92
Author: Abhishek Kumar <[email protected]>
AuthorDate: Fri Apr 30 16:37:24 2021 +0530
ui: show domain paths for offering domain selection (#4979)
Signed-off-by: Abhishek Kumar <[email protected]>
---
ui/src/views/offering/AddComputeOffering.vue | 2 +-
ui/src/views/offering/AddDiskOffering.vue | 2 +-
ui/src/views/offering/AddNetworkOffering.vue | 2 +-
ui/src/views/offering/AddVpcOffering.vue | 2 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/src/views/offering/AddComputeOffering.vue
b/ui/src/views/offering/AddComputeOffering.vue
index 3c09c65..1536a5b 100644
--- a/ui/src/views/offering/AddComputeOffering.vue
+++ b/ui/src/views/offering/AddComputeOffering.vue
@@ -680,7 +680,7 @@
:loading="domainLoading"
:placeholder="this.$t('label.domainid')">
<a-select-option v-for="(opt, optIndex) in this.domains"
:key="optIndex">
- {{ opt.name || opt.description }}
+ {{ opt.path || opt.name || opt.description }}
</a-select-option>
</a-select>
</a-form-item>
diff --git a/ui/src/views/offering/AddDiskOffering.vue
b/ui/src/views/offering/AddDiskOffering.vue
index a392e8e..0b724b6 100644
--- a/ui/src/views/offering/AddDiskOffering.vue
+++ b/ui/src/views/offering/AddDiskOffering.vue
@@ -368,7 +368,7 @@
:loading="domainLoading"
:placeholder="this.$t('label.domainid')">
<a-select-option v-for="(opt, optIndex) in this.domains"
:key="optIndex">
- {{ opt.name || opt.description }}
+ {{ opt.path || opt.name || opt.description }}
</a-select-option>
</a-select>
</a-form-item>
diff --git a/ui/src/views/offering/AddNetworkOffering.vue
b/ui/src/views/offering/AddNetworkOffering.vue
index 4cafaeb..48b39a3 100644
--- a/ui/src/views/offering/AddNetworkOffering.vue
+++ b/ui/src/views/offering/AddNetworkOffering.vue
@@ -410,7 +410,7 @@
:loading="domainLoading"
:placeholder="this.$t('label.domain')">
<a-select-option v-for="(opt, optIndex) in this.domains"
:key="optIndex">
- {{ opt.name || opt.description }}
+ {{ opt.path || opt.name || opt.description }}
</a-select-option>
</a-select>
</a-form-item>
diff --git a/ui/src/views/offering/AddVpcOffering.vue
b/ui/src/views/offering/AddVpcOffering.vue
index 6921dda..cbe2db1 100644
--- a/ui/src/views/offering/AddVpcOffering.vue
+++ b/ui/src/views/offering/AddVpcOffering.vue
@@ -108,7 +108,7 @@
:loading="domainLoading"
:placeholder="this.$t('label.domain')">
<a-select-option v-for="(opt, optIndex) in this.domains"
:key="optIndex">
- {{ opt.name || opt.description }}
+ {{ opt.path || opt.name || opt.description }}
</a-select-option>
</a-select>
</a-form-item>
diff --git a/ui/src/views/offering/UpdateOfferingAccess.vue
b/ui/src/views/offering/UpdateOfferingAccess.vue
index 3fb1cdb..f0c524c 100644
--- a/ui/src/views/offering/UpdateOfferingAccess.vue
+++ b/ui/src/views/offering/UpdateOfferingAccess.vue
@@ -48,7 +48,7 @@
:loading="domainLoading"
:placeholder="this.apiParams.domainid.description">
<a-select-option v-for="(opt, optIndex) in this.domains"
:key="optIndex">
- {{ opt.name || opt.description }}
+ {{ opt.path || opt.name || opt.description }}
</a-select-option>
</a-select>
</a-form-item>
