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

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

commit 0af88353fbd08b5c8aecff2cea9ded782f228dd4
Merge: b69cc0272d4 ca66b76cb92
Author: Vishesh <[email protected]>
AuthorDate: Tue Jul 9 10:40:21 2024 +0530

    Merge branch '4.19'

 .../apache/cloudstack/saml/SAML2AuthManager.java   |  2 +-
 test/integration/smoke/test_cluster_drs.py         |  4 ++-
 ui/src/components/view/SearchView.vue              | 35 +++++++++++++++++-----
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  3 ++
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --cc ui/src/components/view/SearchView.vue
index b81f1b3c800,a43dfabf868..f642ddf938d
--- a/ui/src/components/view/SearchView.vue
+++ b/ui/src/components/view/SearchView.vue
@@@ -85,10 -86,7 +86,10 @@@
                            </span>
                            <block-outlined v-else style="margin-right: 5px" />
                          </span>
 +                        <span 
v-if="(field.name.startsWith('managementserver'))">
 +                          <status :text="opt.state" />
 +                        </span>
-                         {{ $t(opt.path || opt.name) }}
+                         {{ $t((['storageid'].includes(field.name) || 
!opt.path) ? opt.name : opt.path) }}
                        </div>
                      </a-select-option>
                    </a-select>

Reply via email to